Resolve conflicts

[nominatim.git] / test / python / dummy_tokenizer.py

diff --git a/test/python/dummy_tokenizer.py b/test/python/dummy_tokenizer.py
index 0a86ba8d1598752a00af622e3466f4deede31c0e..18e322caef3d5642939698ed5d83c22726058150 100644 (file)
--- a/test/python/dummy_tokenizer.py
+++ b/test/python/dummy_tokenizer.py
@@ -57,7 +57,7 @@ class DummyNameAnalyzer:
     def update_postcodes_from_db(self):
         pass
 
     def update_postcodes_from_db(self):
         pass
 

-    def update_special_phrases(self, phrases):
+    def update_special_phrases(self, phrases, should_replace):

         self.analyser_cache['special_phrases'] = phrases
 
     def add_country_names(self, code, names):
         self.analyser_cache['special_phrases'] = phrases
 
     def add_country_names(self, code, names):