resolve merge conflict

2024-10-21 22:32:44 -05:00 · 2024-10-21 22:32:44 -05:00 · 95d727c4a5
parent e5cf3a102d d2cb348769
commit 95d727c4a5
1 changed files with 1 additions and 1 deletions
--- a/boxes/phone/out-of-tree/shortcuts/view-habits.sh
+++ b/boxes/phone/out-of-tree/shortcuts/view-habits.sh
@ -28,4 +28,4 @@ for i in $habits; do
 	show_past_habit "$i"
 done
-read
+read THROWAWAY