Skip to content

Commit 674e98a

Browse files
jtutuncumaciasjtutuncumacias
committed
finish (finally) of manual category reformatting
1 parent ac3d8f9 commit 674e98a

File tree

1 file changed

+72
-96
lines changed

1 file changed

+72
-96
lines changed

‎search.html‎

Lines changed: 72 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -144,94 +144,83 @@
144144
<option value="trinidadian">Trinidadian</option>
145145
<option value="catalan">Catalan</option>
146146
<option value="cheesesteaks">Cheesesteaks</option>
147-
<<<<<<< HEAD
148147
<option value="chicken_wings">Chicken Wings</option>
149148
<option value="chinese">Chinese</option>
150149
<option value="cantonese">Cantonese</option>
151150
<option value="dimsum">Dim Sum</option>
152151
<option value="shanghainese">Shanghainese</option>
153-
=======
154-
155-
<!--
156-
<option value="Chicken Wings", "chicken_wings"</option>
157-
<option value="Chinese", "chinese"</option>
158-
<option value="Cantonese", "cantonese"</option>
159-
<option value="Dim Sum", "dimsum"</option>
160-
<option value="Shanghainese", "shanghainese"</option>
161-
>>>>>>> FETCH_HEAD
162-
<option value="Szechuan", "szechuan"</option>
163-
<option value="Comfort Food", "comfortfood"</option>
164-
<option value="Creperies", "creperies"</option>
165-
<option value="Cuban", "cuban"</option>
166-
<option value="Czech", "czech"</option>
167-
<option value="Delis", "delis"</option>
168-
<option value="Diners", "diners"</option>
169-
<option value="Ethiopian", "ethiopian"</option>
170-
<option value="Fast Food", "hotdogs"</option>
171-
<option value="Filipino", "filipino"</option>
172-
<option value="Fish & Chips", "fishnchips"</option>
173-
<option value="Fondue", "fondue"</option>
174-
<option value="Food Court", "food_court"</option>
175-
<option value="Food Stands", "foodstands"</option>
176-
<option value="French", "french"</option>
177-
<option value="Gastropubs", "gastropubs"</option>
178-
<option value="German", "german"</option>
179-
<option value="Gluten-Free", "gluten_free"</option>
180-
<option value="Greek", "greek"</option>
181-
<option value="Halal", "halal"</option>
182-
<option value="Hawaiian", "hawaiian"</option>
183-
<option value="Himalayan/Nepalese", "himalayan"</option>
184-
<option value="Hot Dogs", "hotdog"</option>
185-
<option value="Hot Pot", "hotpot"</option>
186-
<option value="Hungarian", "hungarian"</option>
187-
<option value="Iberian", "iberian"</option>
188-
<option value="Indian", "indpak"</option>
189-
<option value="Indonesian", "indonesian"</option>
190-
<option value="Irish", "irish"</option>
191-
<option value="Italian", "italian"</option>
192-
<option value="Japanese", "japanese"</option>
193-
<option value="Ramen", "ramen"</option>
194-
<option value="Korean", "korean"</option>
195-
<option value="Kosher", "kosher"</option>
196-
<option value="Laotian", "laotian"</option>
197-
<option value="Latin American", "latin"</option>
198-
<option value="Colombian", "colombian"</option>
199-
<option value="Salvadoran", "salvadoran"</option>
200-
<option value="Venezuelan", "venezuelan"</option>
201-
<option value="Live/Raw Food", "raw_food"</option>
202-
<option value="Malaysian", "malaysian"</option>
203-
<option value="Mediterranean", "mediterranean"</option>
204-
<option value="Falafel", "falafel"</option>
205-
<option value="Mexican", "mexican"</option>
206-
<option value="Middle Eastern", "mideastern"</option>
207-
<option value="Egyptian", "egyptian"</option>
208-
<option value="Lebanese", "lebanese"</option>
209-
<option value="Modern European", "modern_european"</option>
210-
<option value="Mongolian", "mongolian"</option>
211-
<option value="Moroccan", "moroccan"</option>
212-
<option value="Pakistani", "pakistani"</option>
213-
<option value="Persian/Iranian", "persian"</option>
214-
<option value="Peruvian", "peruvian"</option>
215-
<option value="Pizza", "pizza"</option>
216-
<option value="Polish", "polish"</option>
217-
<option value="Portuguese", "portuguese"</option>
218-
<option value="Russian", "russian"</option>
219-
<option value="Salad", "salad"</option>
220-
<option value="Sandwiches", "sandwiches"</option>
221-
<option value="Scandinavian", "scandinavian"</option>
222-
<option value="Scottish", "scottish"</option>
223-
<option value="Seafood", "seafood"</option>
224-
<option value="Singaporean", "singaporean"</option>
225-
<option value="Slovakian", "slovakian"</option>
226-
<option value="Soul Food", "soulfood"</option>
227-
<option value="Soup", "soup"</option>
228-
<option value="Southern", "southern"</option>
229-
<option value="Spanish", "spanish"</option>
230-
<option value="Steakhouses", "steak"</option>
231-
<option value="Sushi Bars", "sushi"</option>
232-
<option value="Taiwanese", "taiwanese"</option>
233-
<<<<<<< HEAD
234-
<option value="tapas"</option>
152+
<option value="szechuan">Szechuan</option>
153+
<option value="comfortfood">Comfort Food</option>
154+
<option value="creperies">Creperies</option>
155+
<option value="cuban">Cuban</option>
156+
<option value="czech">Czech</option>
157+
<option value="delis">Delis</option>
158+
<option value="diners">Diners</option>
159+
<option value="ethiopian">Ethiopian</option>
160+
<option value="hotdogs">Fast Food</option>
161+
<option value="filipino">Filipino</option>
162+
<option value="fishnchips">Fish & Chips</option>
163+
<option value="fondue">Fondue</option>
164+
<option value="food_court">Food Court</option>
165+
<option value="foodstands">Food Stands</option>
166+
<option value="french">French</option>
167+
<option value="gastropubs">Gastropubs</option>
168+
<option value="german">German</option>
169+
<option value="gluten_free">Gluten-Free</option>
170+
<option value="greek">Greek</option>
171+
<option value="halal">Halal</option>
172+
<option value="hawaiian">Hawaiian</option>
173+
<option value="himalayan">Himalayan/Nepalese</option>
174+
<option value="hotdog">Hot Dogs</option>
175+
<option value="hotpot">Hot Pot</option>
176+
<option value="hungarian">Hungarian</option>
177+
<option value="iberian">Iberian</option>
178+
<option value="indpak">Indian</option>
179+
<option value="indonesian">Indonesian</option>
180+
<option value="irish">Irish</option>
181+
<option value="italian">Italian</option>
182+
<option value="japanese">Japanese</option>
183+
<option value="ramen">Ramen</option>
184+
<option value="korean">Korean</option>
185+
<option value="kosher">Kosher</option>
186+
<option value="laotian">Laotian</option>
187+
<option value="latin">Latin American</option>
188+
<option value="colombian">Colombian</option>
189+
<option value="salvadoran">Salvadoran</option>
190+
<option value="venezuelan">Venezuelan</option>
191+
<option value="raw_food">Live/Raw Food</option>
192+
<option value="malaysian">Malaysian</option>
193+
<option value="mediterranean">Mediterranean</option>
194+
<option value="falafel">Falafel</option>
195+
<option value="mexican">Mexican</option>
196+
<option value="mideastern">Middle Eastern</option>
197+
<option value="egyptian">Egyptian</option>
198+
<option value="lebanese">Lebanese</option>
199+
<option value="modern_european">Modern European</option>
200+
<option value="mongolian">Mongolian</option>
201+
<option value="moroccan">Moroccan</option>
202+
<option value="pakistani">Pakistani</option>
203+
<option value="persian">Persian/Iranian</option>
204+
<option value="peruvian">Peruvian</option>
205+
<option value="pizza">Pizza</option>
206+
<option value="polish">Polish</option>
207+
<option value="portuguese">Portuguese</option>
208+
<option value="russian">Russian</option>
209+
<option value="salad">Salad</option>
210+
<option value="sandwiches">Sandwiches</option>
211+
<option value="scandinavian">Scandinavian</option>
212+
<option value="scottish">Scottish</option>
213+
<option value="seafood">Seafood</option>
214+
<option value="singaporean">Singaporean</option>
215+
<option value="slovakian">Slovakian</option>
216+
<option value="soulfood">Soul Food</option>
217+
<option value="soup">Soup</option>
218+
<option value="southern">Southern</option>
219+
<option value="spanish">Spanish</option>
220+
<option value="steak">Steakhouses</option>
221+
<option value="sushi">Sushi Bars</option>
222+
<option value="taiwanese">Taiwanese</option>
223+
<option value="tapas">Tapas</option>
235224
<option value="tapasmallplates">Tapas/Small Plates</option>
236225
<option value="tex-mex">Tex-Mex</option>
237226
<option value="thai">Thai</option>
@@ -241,19 +230,6 @@
241230
<option value="vegan">Vegan</option>
242231
<option value="vegetarian">Vegetarian</option>
243232
<option value="vietnamese">Vietnamese</option>
244-
=======
245-
<option value="Tapas Bars", "tapas"</option>
246-
<option value="Tapas/Small Plates", "tapasmallplates"</option>
247-
<option value="Tex-Mex", "tex-mex"</option>
248-
<option value="Thai", "thai"</option>
249-
<option value="Turkish", "turkish"</option>
250-
<option value="Ukrainian", "ukrainian"</option>
251-
<option value="Uzbek", "uzbek"</option>
252-
<option value="Vegan", "vegan"</option>
253-
<option value="Vegetarian", "vegetarian"</option>
254-
<option value="Vietnamese", "vietnamese"</option>
255-
// -->
256-
>>>>>>> FETCH_HEAD
257233
</optgroup>
258234
</select>
259235
</div>

0 commit comments

Comments
 (0)