gnucash-on-osx master: Fix merge error.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/24c3627c (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/4488c2b6 (commit)



commit 24c3627c35647dc7cce6221570c7c52e30adb57d
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 9 14:20:55 2019 -0700

    Fix merge error.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 82f0686..2be6691 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -48,12 +48,8 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='gtk3' --enable-local-install">
-<<<<<<< HEAD
-    <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking">
-=======
     <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2"
             repo="aqbanking" >
->>>>>>> Build 3.7 Release.
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>



Summary of changes:
 modulesets/gnucash.modules | 4 ----
 1 file changed, 4 deletions(-)