From a51221205b1cff3387df7574c0e15fdb496a25df Mon Sep 17 00:00:00 2001
From: Justin Hunthrop <jhunthrop@gmail.com>
Date: Fri, 2 Oct 2015 11:43:48 -0500
Subject: [PATCH] editing conflict.txt like Nan said

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

diff --git a/conflict.txt b/conflict.txt
index 6a82720..d462a98 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 git is good at conflict resolution.
 
 please keep your line here:
+1. Git is fun