X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=install1.2.sh;h=e70a06945c6d91035b7c23f26b9c28b78046feed;hp=9b253cd93070880aaee3233909846245eec17eed;hb=ada415c3d8f427e9078980a2205466ce032aefc8;hpb=7416a66cabc921c52ea52d01c1a14e45ad5a7789

diff --git a/install1.2.sh b/install1.2.sh
index 9b253cd93..e70a06945 100644
--- a/install1.2.sh
+++ b/install1.2.sh
@@ -1,10 +1,18 @@
 #!/bin/sh
+<<<<<<< HEAD
  
 #git clone git://github.com/roojs/gir-1.2-gtk-2.0.git gir-1.2
+=======
+#git clone git://github.com/roojs/gir-1.2-gtk-3.0.git gir-1.2
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 
 #// compile GIR's
 mkdir -p ~/.Builder/girepository-1.2 || false
  
+<<<<<<< HEAD
+=======
+ 
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 ls gir-1.2 | sed s/.gir// | awk \
     '{ print "g-ir-compiler  gir-1.2/" $1 ".gir --includedir=gir-1.2 -o  ~/.Builder/girepository-1.2/" $1 ".typelib" }' \
     | sh -x