trng201 - conflict.txt update post -- FIXED

jasonobermeyer · jasonobermeyer · commit 8aecd5d921c8 · 2015-10-02T11:30:45.000-07:00
diff --git a/conflict.txt b/conflict.txt
@@ -1,3 +1,9 @@
 git is very useful.
 
 please keep your line here:
+
+
+
+
+
+git is confusing.... where's sccs?
