sync

[gitlive] / config1.builder

diff --git a/config1.builder b/config1.builder
index c5e4bc9..55088b0 100644 (file)
--- 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" : [
         ]