merge error

Alex Savenko
2 parents aec41363 6593aea0
Showing 3 changed files with 9 additions and 2 deletions Show diff stats
clinica
frontend/views/layouts/main.php
frontend/views/site/index.php
+Subproject commit 8b1b0efde228ff71e43eba90086e0c15392645cc
@@ -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>
@@ -127,10 +127,16 @@ JS;
       <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>