From 6d623981d64c1dea9c2ee4c221c65dc9955b1dc7 Mon Sep 17 00:00:00 2001
From: Jose Casasola <mjcasas@wal-mart.com>
Date: Fri, 2 Oct 2015 09:43:31 -0700
Subject: [PATCH] FIXED Conflict Resolution Troubles

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

diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..7603374 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 git is very useful.
 
 please keep your line here:
+git ia not better than me at conflict resolution.