Commit c80e1c838318b1b0145482234fc2ccfb7083c9dd
1 parent
00ca844e
поправил site/index на сервере
Showing
1 changed file
with
0 additions
and
9 deletions
Show diff stats
frontend/views/site/index.php
| ... | ... | @@ -126,17 +126,8 @@ JS; |
| 126 | 126 | <div class="hidden-xs col-sm-5 col-md-5 col-lg-5"></div> |
| 127 | 127 | <div class="col-sm-7 col-md-7 col-lg-7"> |
| 128 | 128 | <div class="style box3-text-wr"> |
| 129 | -<<<<<<< HEAD | |
| 130 | -<<<<<<< HEAD | |
| 131 | - <h1 class="box3-text-title"><?=$seo->h1?></h1> | |
| 132 | -======= | |
| 133 | - <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div> | |
| 134 | ->>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f | |
| 135 | -======= | |
| 136 | 129 | |
| 137 | 130 | <h1 class="box3-text-title"><?=$seo->h1?></h1> |
| 138 | - | |
| 139 | ->>>>>>> 6593aea0001d6585bc33df3764d19bc3cd2d264a | |
| 140 | 131 | <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp"> |
| 141 | 132 | <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt=""> |
| 142 | 133 | </div> | ... | ... |