From 55a0df4ad5cddaf498b4fe793394c55a44d7e813 Mon Sep 17 00:00:00 2001
From: Frank Thanh Cao <franktcao@gmail.com>
Date: Tue, 1 May 2018 13:25:15 -0400
Subject: [PATCH] Conflicting branches

---
 names/frank.docx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/names/frank.docx b/names/frank.docx
index 077e373..491a050 100644
--- a/names/frank.docx
+++ b/names/frank.docx
@@ -1 +1,3 @@
 Word.
+
+Whoa, this is different
-- 
GitLab