1 files changed, 1 insertions, 1 deletions

diff --git a/foo b/foo
index df565ac..9daeafb 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-conflict2 conflict
+test