Слияние с develop

[invent/invent.git] / config / web.php

diff --git a/config/web.php b/config/web.php
index 524bea4..6c05664 100644 (file)
--- a/config/web.php
+++ b/config/web.php
@@ -71,6 +71,7 @@ $config = [
                         'app' => 'types.app',
                     ],
                 ],
+<<<<<<< HEAD
                 'status*' => [
                     'class' => 'yii\i18n\PhpMessageSource',
                     'sourceLanguage' => 'en-US',
@@ -79,6 +80,8 @@ $config = [
                         'app' => 'status.app',
                     ],
                 ],
+=======
+>>>>>>> develop
                 'contact*' => [
                     'class' => 'yii\i18n\PhpMessageSource',
                     'sourceLanguage' => 'en-US',