From 8a1a9748511dd103bd72594ffe8e8375d85d0632 Mon Sep 17 00:00:00 2001
From: Kurt Taylor <kurt.r.taylor@gmail.com>
Date: Mon, 17 Oct 2016 11:07:46 -0500
Subject: [PATCH] merge conflict test

Change-Id: Ifd1e4e6f4d0b51b241dce2ac3e3a31029b09f9af
---
 herpderp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/herpderp b/herpderp
index f2e41136e..db14f2a14 100644
--- a/herpderp
+++ b/herpderp
@@ -1 +1,2 @@
 stuff
+and yet more stuff