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

diff --git a/Builder3/RooProjectProperties.js b/Builder3/RooProjectProperties.js
index 9b24d852c..e3ad35811 100644
--- a/Builder3/RooProjectProperties.js
+++ b/Builder3/RooProjectProperties.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
 //Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;