1 files changed, 1 insertions, 1 deletions

diff --git a/foo b/foo
index 5716ca5..f853c8d 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-bar
+conflict2