Monitor.js

diff --git a/gitlive.js b/gitlive.js
index e393557..0d567db 100644 (file)
--- a/gitlive.js
+++ b/gitlive.js
@@ -9,11 +9,23 @@
 * 
 * 
 */
+<<<<<<< HEAD
+GI      = imports.gi.GIRepository
+GLib        = imports.gi.GLib;
+
+// we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
+GI.IRepository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.1');
+
+Gio      = imports.gi.Gio;
+Gtk      = imports.gi.Gtk;
+Notify = imports.gi.Notify;
+=======
 var GI      = imports.gi.GIRepository;
 var Gio      = imports.gi.Gio;
 var GLib      = imports.gi.GLib;
 var Gtk      = imports.gi.Gtk;
 var Notify = imports.gi.Notify;
+>>>>>>> e9aa44647c32a34dfa368f7594ed72579c912bc3
 
 var Spawn = imports.Spawn;
 var Git = imports.Git;

diff --git a/tests/tickets.js b/tests/tickets.js
new file mode 100644 (file)
index 0000000..e69de29