fix merge

diff --cc src/Builder4/DialogFiles.bjs
index 83b43db,c7412a0..bc2d297
--- 1/src/Builder4/DialogFiles.bjs
--- 2/src/Builder4/DialogFiles.bjs
+++ b/src/Builder4/DialogFiles.bjs
@@@ -1,4 -1,4 +1,4 @@@
--{
++g{
   "build_module" : "builder",
   "gen_extended" : false,
   "items" : [
@@@ -1184,11 -1184,9 +1184,8 @@@
     "| void load" : [
      "() {",
      "     // cl list...",
-     "    ",
-     "       ",
+     "     ",
      "     _this.is_loading = true;",
-     "        ",
-     "",
 -    "         ",
      "     Project.Project.loadAll();",
      "     _this.project_list.el.set_model(new Gtk.SingleSelection(null));",
      "     Project.Project.loadIntoStore(this.projectmodel.el);",

diff --cc src/Builder4/DialogFiles.vala
index 346b64f,34294b2..5035a6b
--- 1/src/Builder4/DialogFiles.vala
--- 2/src/Builder4/DialogFiles.vala
+++ b/src/Builder4/DialogFiles.vala
@@@ -177,11 -177,9 +177,9 @@@ public class DialogFiles : Objec
        }//
        public void load () {
             // cl list...
-           
-              
+            
             _this.is_loading = true;
-               
-       
 -               
++
             Project.Project.loadAll();
             _this.project_list.el.set_model(new Gtk.SingleSelection(null));
             Project.Project.loadIntoStore(this.projectmodel.el);

diff --cc src/JsRender/Node.vala
Simple merge

diff --cc src/Spawn.vala
Simple merge