Latest initial state

karti49 · Apr 29, 2020 · 504627a · 504627a
2 parents f313b16 + 953bceb
commit 504627a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/database.py b/src/database.py
@@ -12,7 +12,11 @@ def list_reminders():
                 print(e.ljust(32), end=' ')
         print()
 
+<<<<<<< HEAD
 def add_reminder():
+=======
+def add_reminder(reminder):
+>>>>>>> 953bcebd1437acfa83993b25cca4faf463989db8
     print()
     reminder = input("What would you like to be reminded about?: ")