From 0c15c526b68c54e3c25a6a436e4d1dcdc862544c Mon Sep 17 00:00:00 2001
From: Chase Hallsted <chase.hallsted@gmail.com>
Date: Fri, 2 Oct 2015 09:43:47 -0700
Subject: [PATCH] Git is GREAT at Conflice Resolution

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

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