@@ -43,11 +43,3 @@ |
||
43 | 43 | |
44 | 44 | public $depends = [ |
45 | 45 | <<<<<<< HEAD |
46 | - 'yii\web\YiiAsset', |
|
47 | -======= |
|
48 | - 'yii\web\YiiAsset', |
|
49 | - 'yii\bootstrap\BootstrapAsset', |
|
50 | - 'yii\bootstrap\BootstrapPluginAsset', |
|
51 | ->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5 |
|
52 | - ]; |
|
53 | -} |
|
54 | 46 | \ No newline at end of file |
@@ -43,11 +43,3 @@ |
||
43 | 43 | |
44 | 44 | public $depends = [ |
45 | 45 | <<<<<<< HEAD |
46 | - 'yii\web\YiiAsset', |
|
47 | -======= |
|
48 | - 'yii\web\YiiAsset', |
|
49 | - 'yii\bootstrap\BootstrapAsset', |
|
50 | - 'yii\bootstrap\BootstrapPluginAsset', |
|
51 | ->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5 |
|
52 | - ]; |
|
53 | -} |
|
54 | 46 | \ No newline at end of file |
@@ -42,12 +42,4 @@ |
||
42 | 42 | ]; |
43 | 43 | |
44 | 44 | public $depends = [ |
45 | -<<<<<<< HEAD |
|
46 | - 'yii\web\YiiAsset', |
|
47 | -======= |
|
48 | - 'yii\web\YiiAsset', |
|
49 | - 'yii\bootstrap\BootstrapAsset', |
|
50 | - 'yii\bootstrap\BootstrapPluginAsset', |
|
51 | ->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5 |
|
52 | - ]; |
|
53 | -} |
|
54 | 45 | \ No newline at end of file |
46 | +<< << <<< HEAD |
@@ -43,11 +43,3 @@ |
||
43 | 43 | |
44 | 44 | public $depends = [ |
45 | 45 | <<<<<<< HEAD |
46 | - 'yii\web\YiiAsset', |
|
47 | -======= |
|
48 | - 'yii\web\YiiAsset', |
|
49 | - 'yii\bootstrap\BootstrapAsset', |
|
50 | - 'yii\bootstrap\BootstrapPluginAsset', |
|
51 | ->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5 |
|
52 | - ]; |
|
53 | -} |
|
54 | 46 | \ No newline at end of file |
@@ -43,11 +43,3 @@ |
||
43 | 43 | |
44 | 44 | public $depends = [ |
45 | 45 | <<<<<<< HEAD |
46 | - 'yii\web\YiiAsset', |
|
47 | -======= |
|
48 | - 'yii\web\YiiAsset', |
|
49 | - 'yii\bootstrap\BootstrapAsset', |
|
50 | - 'yii\bootstrap\BootstrapPluginAsset', |
|
51 | ->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5 |
|
52 | - ]; |
|
53 | -} |
|
54 | 46 | \ No newline at end of file |