From ca20775669aecc33e60bd62ceea7b2d9a51640f1 Mon Sep 17 00:00:00 2001
From: Matt C <mdc028@bucknell.edu>
Date: Wed, 20 Oct 2021 11:30:29 -0400
Subject: [PATCH] lots of merge fixes

---
 continue.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/continue.sh b/continue.sh
index 46d6e1b..77e040c 100755
--- a/continue.sh
+++ b/continue.sh
@@ -48,6 +48,7 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 
 clear
+<<<<<<< HEAD
 yesno "Do you need more locales than just en_US?"
 echo "MORE=$yn"
 MORE="$yn"
@@ -64,6 +65,17 @@ if [[ "$MORE" == "0" ]]; then
     dump "When we open the file, please remove the leading # before any locales you need.\
     Then, save and exit."
     ${PGRM} /etc/locale.gen
+=======
+prompt "Do you need more locales than just en_US? (y/N)"
+echo "MORE=$response"
+MORE="$response"
+
+if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then
+    inf "When we open the file, please remove the leading # before any locales you need."
+    inf "Then, save and exit.\nPress enter."
+    read
+    micro /etc/locale.gen
+>>>>>>> a911136 (ok sorry (not) we're using micro now)
 fi
 
 inf "Generating selected locales."