From dc86732100993b30627607a9055a2170043a77ae Mon Sep 17 00:00:00 2001
From: Peter Ashford <pashford@users.noreply.github.com>
Date: Mon, 28 May 2018 00:34:03 -0700
Subject: [PATCH] Correct file name

---
 Workflow-Conflicts.md | 1 +
 Workflow/Conflicts.md | 0
 2 files changed, 1 insertion(+)
 create mode 100644 Workflow-Conflicts.md
 delete mode 100644 Workflow/Conflicts.md

diff --git a/Workflow-Conflicts.md b/Workflow-Conflicts.md
new file mode 100644
index 0000000..ba8e43d
--- /dev/null
+++ b/Workflow-Conflicts.md
@@ -0,0 +1 @@
+# Fix Conflicts
\ No newline at end of file
diff --git a/Workflow/Conflicts.md b/Workflow/Conflicts.md
deleted file mode 100644
index e69de29..0000000