From 6bc4e165a3bada08c4bad515fb1e0cc867c3de80 Mon Sep 17 00:00:00 2001
From: Joshua Padman <jpadman@redhat.com>
Date: Wed, 6 Dec 2017 20:55:29 +1100
Subject: [PATCH] Merge conflict test

Is it happening locally or externally?

Change-Id: I1e6324ae5c099bec3b6f6ddadb6da62787c38e14
---
 aa | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aa b/aa
index fe0ca48c8..3c8500bbf 100644
--- a/aa
+++ b/aa
@@ -1 +1,2 @@
 asdfasf
+This file doesn't exist yet.