From 8aecd5d921c86d613a223346a7f8e82beb7f136d Mon Sep 17 00:00:00 2001
From: Jason Obermeyer <jason.obermeyer@walmart.com>
Date: Fri, 2 Oct 2015 09:44:29 -0700
Subject: [PATCH] trng201 - conflict.txt update post -- FIXED

---
 conflict.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..c21e344 100644
--- 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?