From c80e1c838318b1b0145482234fc2ccfb7083c9dd Mon Sep 17 00:00:00 2001
From: Alex Savenko <program.artweb@gmail.com>
Date: Wed, 6 Jun 2018 11:42:02 +0300
Subject: [PATCH] поправил site/index на сервере

---
 frontend/views/site/index.php |  9 ---------
 1 file changed, 0 insertions(+), 9 deletions(-)

diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index a970ad2..2d5c0d2 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -126,17 +126,8 @@ JS;
       <div class="hidden-xs col-sm-5 col-md-5 col-lg-5"></div>
       <div class="col-sm-7 col-md-7 col-lg-7">
         <div class="style box3-text-wr">
-<<<<<<< HEAD
-<<<<<<< HEAD
-          <h1 class="box3-text-title"><?=$seo->h1?></h1>
-=======
-          <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div>
->>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
-=======
 
           <h1 class="box3-text-title"><?=$seo->h1?></h1>
-         
->>>>>>> 6593aea0001d6585bc33df3764d19bc3cd2d264a
           <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp">
             <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt="">
           </div>
--
libgit2 0.21.4