From c7226ddd4f9b7b4e92d7c1d0e4edf0d7381a44be Mon Sep 17 00:00:00 2001
From: Mike Alexander <mta@umich.edu>
Date: Mon, 10 Apr 2017 01:37:23 -0400
Subject: [PATCH] Delete left over line from previous merge conflict.

---
 README | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README b/README
index d27abc530f..642365f0ca 100644
--- a/README
+++ b/README
@@ -212,7 +212,6 @@ Building & Installing
 GnuCash uses GNU Automake to handle the build process, so for most of
 the details, see the generic instructions in INSTALL.  (If you are
 building directly from Git, read the README.git file for more instructions.)
->>>>>>> maint
 Below we detail the GnuCash specific bits.
 
 Prior to building GnuCash, you will have to obtain and install the