[balsa/wip/gtk4] gresource: fix the build

[Peter Bloomfield <peterb src gnome org>]

commit 8a9cf8fefee9f50f6e74830768d34781251d533c
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Apr 22 11:22:53 2019 -0400

    gresource: fix the build

 ui/balsa.gresource.xml | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/ui/balsa.gresource.xml b/ui/balsa.gresource.xml
index 31a9eb45f..b8d6c7158 100644
--- a/ui/balsa.gresource.xml
+++ b/ui/balsa.gresource.xml
@@ -3,11 +3,7 @@
   <gresource prefix="/org/desktop/Balsa">
     <file compressed="true">main-window.ui</file>
     <file compressed="true">message-window.ui</file>
-<<<<<<< HEAD
     <file compressed="true">compose-window.ui</file>
-=======
-    <file compressed="true">sendmsg-window.ui</file>
->>>>>>> 3daecc95d... Use GResource instead of installed files
     <file compressed="true">source-viewer.ui</file>
   </gresource>
 </gresources>