X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=config1.builder;h=55088b0379197cd6ad6b712f9e5c6bad5280ab86;hp=c5e4bc997dd049a9b4762379f733eb75aefbe9a1;hb=1f7e6b712f9ee99d621a3a67f1c0795c6106bde6;hpb=f38120dee592b816594ab635c624aa858e00b4c1

diff --git a/config1.builder b/config1.builder
index c5e4bc99..55088b03 100644
--- a/config1.builder
+++ b/config1.builder
@@ -17,7 +17,8 @@
             "..//gitlive/GitBranch.vala",
             "..//gitlive/NewBranch.vala",
             "..//gitlive/GitMonitorQueue.vala",
-            "..//gitlive/RooTicket.vala"
+            "..//gitlive/RooTicket.vala",
+            "..//gitlive/MergeBranch.vala"
         ],
         "packages" : [
         ]