From 0317bd6165859b2ef4a1cadd66cf048b90dde273 Mon Sep 17 00:00:00 2001
From: skotyan <skotyan@wal-mart.com>
Date: Fri, 2 Oct 2015 09:47:31 -0700
Subject: [PATCH] Will the real git shady please stand up!

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

diff --git a/conflict.txt b/conflict.txt
index 6a82720..6d8157f 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,3 @@
 git is good at conflict resolution.
 
-please keep your line here:
+please keep your line here: the git of life!