X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/1a933190935c881c069b0396035f284a68a0829b..6d56cbb3e8cfe886d92737087d24e49ff7fd31e0:/lib-php/migration/phraseSettingsToJson.php

diff --git a/lib-php/migration/phraseSettingsToJson.php b/lib-php/migration/phraseSettingsToJson.php
index 15c49f0a..187e3fc6 100644
--- a/lib-php/migration/phraseSettingsToJson.php
+++ b/lib-php/migration/phraseSettingsToJson.php
@@ -1,9 +1,16 @@
 <?php
 
 $phpPhraseSettingsFile = $argv[1];
+<<<<<<< HEAD
 $jsonPhraseSettingsFile = dirname($phpPhraseSettingsFile).'/'.basename($phpPhraseSettingsFile, '.php').'.json';
 
 if (file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile)) {
+=======
+$jsonPhraseSettingsFile = dirname($phpPhraseSettingsFile)."/".basename($phpPhraseSettingsFile, ".php").".json";
+
+if(file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile))
+{
+>>>>>>> 3d939458... Changed phrase_settings.py to phrase-settings.json and added migration function for old php settings file.
     include $phpPhraseSettingsFile;
 
     $data = array();
@@ -16,4 +23,8 @@ if (file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile)
     $jsonFile = fopen($jsonPhraseSettingsFile, 'w');
     fwrite($jsonFile, json_encode($data));
     fclose($jsonFile);
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> 3d939458... Changed phrase_settings.py to phrase-settings.json and added migration function for old php settings file.