X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=Builder3%2FAbout.js;h=7becbf44c02ee63c230aa95560c045bcafae0c5d;hp=9a6e0938323f375ecaa883de3da8120c7bc12688;hb=ada415c3d8f427e9078980a2205466ce032aefc8;hpb=3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b

diff --git a/Builder3/About.js b/Builder3/About.js
index 9a6e09383..7becbf44c 100644
--- a/Builder3/About.js
+++ b/Builder3/About.js
@@ -7,6 +7,11 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
+//GtkClutter = imports.gi.GtkClutter;
+//Gdl = imports.gi.Gdl;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 console = imports.console;
 XObject = imports.XObject.XObject;
 About=new XObject({