[gnome-clocks/bilelmoussaoui/redesign-timer: 2/2] Fix conflicts

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 617c6d97e5ae27092c64491c6c9d9756a7fc46f2
Merge: 2c458c7 3c1ee7d
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Tue Jan 28 14:41:50 2020 +0100

    Fix conflicts

 data/ui/timer_row.ui | 241 ++++++++++++++++++++++++++-------------------------
 src/timer.vala       |  63 ++++++++------
 2 files changed, 159 insertions(+), 145 deletions(-)
---
diff --cc src/timer.vala
index 32c5c1f,7e44a2c..fde3aaa
--- a/src/timer.vala
+++ b/src/timer.vala
@@@ -475,20 -466,8 +487,19 @@@ public class Face : Gtk.Stack, Clocks.C
          load ();
      }
  
 +    private void update_timer (Item item) {
 +        /*
 +        var current_position = timers.get_index (item);
 +        if (current_position != -1) {
 +            Item? timer_item = (Item) timers.get_item (current_position);
 +
 +            timer_item.name = item.name;
 +            save ();
 +        }*/
 +    }
 +
      private void remove_timer (Item item) {
          timers.remove (item);
-         save ();
      }