Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/user_interaction.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 82ddab7a..822f63be 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -411,7 +411,6 @@ def select_mirror_regions(mirrors, show_top_mirrors=True):
raise RequirementError("Selected region does not exist.")
return selected_mirrors
-<<<<<<< HEAD
raise RequirementError("Selecting mirror region require a least one region to be given as an option.")