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

diff --git a/Builder3/About.js b/Builder3/About.js
index 3eead261a..7becbf44c 100644
--- a/Builder3/About.js
+++ b/Builder3/About.js
@@ -7,8 +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({