Builder/Provider/File/Gtk.js

[app.Builder.js] / Builder3 / Editor.js

diff --git a/Builder3/Editor.js b/Builder3/Editor.js
index 18bfb09..9c4f0e1 100644 (file)
--- 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({