resolving conflicts

[playground.git] / orange.txt

diff --git a/orange.txt b/orange.txt
index 3bd1f0e..2e3793d 100644 (file)
--- a/orange.txt
+++ b/orange.txt
@@ -1,2 +1,3 @@
-foo
+trying out the email-with-diffs feature
+trying out the email-with-diffs (2)
 bar