From 85437af155c9cc08654598d556c20f4fd2338042 Mon Sep 17 00:00:00 2001
From: smitchelus <scott@the-mitchells.org>
Date: Mon, 28 Apr 2014 12:33:22 -0400
Subject: [PATCH] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d9d5a6b..29c9ea9 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,4 @@ testing
 testing
 Another line
 Yet another
+This is a real conflict