From 6593aea0001d6585bc33df3764d19bc3cd2d264a Mon Sep 17 00:00:00 2001
From: dozer111 <alkhonko@gmail.com>
Date: Wed, 6 Jun 2018 10:27:22 +0200
Subject: [PATCH] поправил ошибки с мержем, и футером

---
 frontend/views/layouts/main.php | 4 ++--
 frontend/views/site/index.php   | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index e7d6e9a..f9cc718 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -139,7 +139,7 @@
                 </div>
                 
                 <div class="hidden-xs btn-header-wr">
-                    <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span>
+                    <span class="btn_ modal-link" data-form="write-to"><?=\Yii::t('app', 'Make an appointment') ?></span>
                 </div>
                 
                 <ul class="hidden-xs hidden-sm">
@@ -369,7 +369,7 @@
             </div>
             <div class="row">
               <div class="col-xs-12 col-sm-12 studio-wrapp">
-                <div class="all-rights-txt">©<?=\Yii::t('app','All rights reserved');?> , 2018. ABClinic</div>
+                <div class="all-rights-txt">© <?=\Yii::t('app','All rights reserved');?> , 2018. ABClinic</div>
                 <div class="link-studio">
                   <a href="http://artweb.ua"><?=\Yii::t('app','Creating sites');?></a>
                 </div>
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index 7e2126b..1cca4e7 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -126,11 +126,9 @@ 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
+
           <h1 class="box3-text-title"><?=$seo->h1?></h1>
-=======
-          <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div>
->>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
+         
           <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