Убраны ошибки дублирования во время разрешения конфликтов

diff --git a/erp24/views/motivation/index.php b/erp24/views/motivation/index.php
index b2e27e424e2a09145d657d28c89a6c024926b209..38386efcadefcf479a0a223c760884edfa182d43 100644 (file)
--- a/erp24/views/motivation/index.php
+++ b/erp24/views/motivation/index.php
@@ -17,8 +17,6 @@ use yii_app\records\MotivationCostsItem;
 /** @var $week5Header string */
 
 
-$this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::POS_END]);
-
 $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::POS_END]);
 
 ?>
@@ -75,10 +73,6 @@ $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::P
                 <div class="mb-3"><?= Html::button('Загрузка плановых значений', ['class' => 'btn btn-success btn-sm',
                         'onclick' => 'openUploadDictionary();'])?></div>
             </div>
-            <div class="d-flex justify-content-around align-items-center gap-2">
-                <div class="mb-3"><?= Html::button('Загрузка плановых значений', ['class' => 'btn btn-success btn-sm',
-                        'onclick' => 'openUploadDictionary();'])?></div>
-            </div>
         </div>
 
         <?php ActiveForm::end() ?>