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