From 8924b0d526671f258b189597ed5698dcc9171169 Mon Sep 17 00:00:00 2001
From: John S Long <john@128.io>
Date: Thu, 4 May 2017 19:25:17 -0500
Subject: [PATCH] Testing a conflict

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

diff --git a/README.md b/README.md
index 89d5050..83fedb8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 # PythonSimpleEmail
 
 Welcome CLC Linux!
+
+This should conflict.