Forgot to hit save after merge conflict fixes.
This commit is contained in:
parent
5852582bbf
commit
19c928df6a
|
|
@ -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:
|
other than the options and their indexes. As an example:
|
||||||
|
|
||||||
generic_select(["first", "second", "third option"])
|
generic_select(["first", "second", "third option"])
|
||||||
<<<<<<< HEAD
|
|
||||||
0: first
|
0: first
|
||||||
1: second
|
1: second
|
||||||
2: third option
|
2: third option
|
||||||
|
|
||||||
When the user has entered the option correctly,
|
When the user has entered the option correctly,
|
||||||
this function returns an item from list, a string, or None
|
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`
|
# Checking if options are different from `list` or `dict`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue