Merge branch 'master' of https://github.com/imdone/imdone-atom

imdone · Mar 16, 2018 · c67ed5f · c67ed5f
2 parents a192d3a + 5f17960
commit c67ed5f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/services/reminders.js b/lib/services/reminders.js
@@ -28,7 +28,11 @@ class Reminders {
     }, 20000)
   }
 
+<<<<<<< HEAD
   // DOING: 2018-03-15 Show imdone logo in notifications.
+=======
+  // DOING: Show imdone logo in notifications. id:142 gh:356 ic:gh
+>>>>>>> 5f179600a4203f59366fe5fdb9094da28eea557f
   notify(task) {
     notifier.notify(
       {