Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-04-27 13:35:14 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-04-27 13:35:14 +0200
commit19c928df6ae7f6bf700817d5d709c8918bf3d411 (patch)
treee017509547e15665440c2b51906e2172854c602f /archinstall/lib
parent5852582bbf3e754c957fb839dc8a9b0f6ed70a47 (diff)
Forgot to hit save after merge conflict fixes.
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/user_interaction.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 91ed5ed9..bd9d432d 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -259,20 +259,12 @@ def generic_select(options, input_text="Select one of the above by index or abso
other than the options and their indexes. As an example:
generic_select(["first", "second", "third option"])
-<<<<<<< HEAD
0: first
1: second
2: third option
When the user has entered the option correctly,
this function returns an item from list, a string, or None
-=======
- 1: first
- 2: second
- 3: third option
-
- it will return the selected text.
->>>>>>> 831f5e4eaf66f6f1a2aed04932af064ce9314dd4
"""
# Checking if options are different from `list` or `dict`