X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=Builder3%2FEditor.js;h=9c4f0e1cf720cac07b0a37c5490560ad7672ef6d;hp=18bfb092b1355ad8a9fdfc12ab63f88407a9b065;hb=ada415c3d8f427e9078980a2205466ce032aefc8;hpb=7416a66cabc921c52ea52d01c1a14e45ad5a7789

diff --git a/Builder3/Editor.js b/Builder3/Editor.js
index 18bfb092b..9c4f0e1cf 100644
--- a/Builder3/Editor.js
+++ b/Builder3/Editor.js
@@ -7,7 +7,10 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
 //GtkClutter = imports.gi.GtkClutter;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  console = imports.console;
 XObject = imports.XObject.XObject;
 Editor=new XObject({