Builder/Provider/File/Gtk.js

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

diff --git a/Builder3/RooProjectProperties.js b/Builder3/RooProjectProperties.js
index 6db9a8d..e3ad358 100644 (file)
--- a/Builder3/RooProjectProperties.js
+++ b/Builder3/RooProjectProperties.js
@@ -7,6 +7,10 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
+//GtkClutter = imports.gi.GtkClutter;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 //Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;