X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=gtkrun.js;h=fc8a9621668555ff65df4c9996fe960cb7674ada;hp=50955314ffd0dd2559351c04b5e4cc58d1f1a210;hb=ada415c3d8f427e9078980a2205466ce032aefc8;hpb=3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b

diff --git a/gtkrun.js b/gtkrun.js
index 50955314f..fc8a96216 100644
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -48,9 +48,15 @@ Vte         = imports.gi.Vte;
 
 //GtkClutter  = imports.gi.GtkClutter;
 
+<<<<<<< HEAD
+//if (GtkClutter) {    
+//    GtkClutter.init(Seed.argv);
+//}
+=======
 if (typeof(GtkClutter) != 'undefined') {    
     GtkClutter.init(Seed.argv);
 }
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 
 File    = imports.File.File;