From c6c823dfeef90f4e27618887d9a8597b8a3cbeb5 Mon Sep 17 00:00:00 2001
From: Daniel Moreno <danmoreno@walmart.com>
Date: Fri, 2 Oct 2015 09:45:30 -0700
Subject: [PATCH] Conflict edited. Git is better

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

diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..6825197 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,5 @@
 git is very useful.
 
 please keep your line here:
+
+git is better now at conflict resolution.