Commit 37fc4b5b authored by nanahira's avatar nanahira

fixmerge

parent 675d4a4d
......@@ -27,12 +27,8 @@ control_mode = 0
draw_field_spell = 1
separate_clear_button = 1
#auto_search_limit >= 0: Start search automatically when the user enters N chars
<<<<<<< HEAD
auto_search_limit = 2
#search_multiple_keywords = 0: Disable. 1: Search mutiple keywords with separator " ". 2: with separator "+"
=======
auto_search_limit = -1
>>>>>>> cd7129ef3c8a23551b15e710c306d73eb7e8a8fd
search_multiple_keywords = 1
search_regex = 0
ignore_deck_changes = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment