conflicted settings

Alex Savenko
1 parent e7fd226c
Showing 1 changed file with 1 additions and 5 deletions Show diff stats
common/config/settings.php
@@ -5,11 +5,7 @@ return [
         'phone' => '+38 (044) 593-73-76',
         'phone2' => '+38 (098) 468-07-64',
         'skype' => 'artwebstudio',
-<<<<<<< HEAD
         'email' => 'kazimirova.artweb@gmail.com',
-=======
-        'email' => 'kennen.md@gmail.com',
->>>>>>> fc6e429ed2845fc1a2bb0aec4b9fa64211a7f823
         'house' => '1-М',
         'street' => 'пр. М. Бажана',
         'office' => '25',
@@ -34,4 +30,4 @@ Disallow:
         'tag_manager' => '',
         'id' => 1,
     ],
-];
 \ No newline at end of file
+];