diff --git a/common/mail/passwordResetToken-html.php b/common/mail/passwordResetToken-html.php
index f3daf49..b34c8bc 100644
--- a/common/mail/passwordResetToken-html.php
+++ b/common/mail/passwordResetToken-html.php
@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /* @var $this yii\web\View */
-/* @var $user common\models\User */
+/* @var $user common\models\User */ 
 
 $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
 ?>
diff --git a/common/messages/ru/core.php b/common/messages/ru/core.php
index 26553db..c09a9f5 100644
--- a/common/messages/ru/core.php
+++ b/common/messages/ru/core.php
@@ -1,4 +1,5 @@
 <?php
+<<<<<<< Updated upstream
 return [
     'name'=>'Имя',
     'email'=>'Email',
@@ -6,4 +7,12 @@ return [
     'message'=>'Сообщение',
     'Send' => 'Отправить',
     'Send message'=>'Отправить сообщение',
-];
\ No newline at end of file
+];
+=======
+    /**
+     * Created by PhpStorm.
+     * User: user
+     * Date: 17.05.18
+     * Time: 11:26
+     */
+>>>>>>> Stashed changes
--
libgit2 0.21.4