Monitor.js

diff --cc gitlive.js
index 4bbb739,e393557..0d567db
--- 1/gitlive.js
--- 2/gitlive.js
+++ b/gitlive.js
@@@ -9,20 -9,16 +9,28 @@@
  * 
  * 
  */
++<<<<<<< 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
  
- Spawn = imports.Spawn;
- Git = imports.Git;
- StatusIcon = imports.StatusIcon.StatusIcon;
- Monitor = imports.Monitor.Monitor;
+ var Spawn = imports.Spawn;
+ var Git = imports.Git;
+ var StatusIcon = imports.StatusIcon.StatusIcon;
+ var Monitor = imports.Monitor.Monitor;
  
  
  //File = imports[__script_path__+'/../introspection-doc-generator/File.js'].File

diff --cc tests/tickets.js
index 0000000,0000000..e69de29
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/tests/tickets.js