|
|
@@ -5,7 +5,7 @@
|
|
|
'type' => 'project',
|
|
|
'install_path' => __DIR__ . '/../../',
|
|
|
'aliases' => array(),
|
|
|
- 'reference' => 'f1e3ec543d0db57be30aff94a80728e4451ce6c2',
|
|
|
+ 'reference' => '6aa80421defce588555067c09077b5c848a5384c',
|
|
|
'name' => 'yiisoft/yii2-app-advanced',
|
|
|
'dev' => true,
|
|
|
),
|
|
|
@@ -753,7 +753,11 @@
|
|
|
'type' => 'project',
|
|
|
'install_path' => __DIR__ . '/../../',
|
|
|
'aliases' => array(),
|
|
|
+<<<<<<< HEAD
|
|
|
'reference' => 'f1e3ec543d0db57be30aff94a80728e4451ce6c2',
|
|
|
+=======
|
|
|
+ 'reference' => '6aa80421defce588555067c09077b5c848a5384c',
|
|
|
+>>>>>>> master
|
|
|
'dev_requirement' => false,
|
|
|
),
|
|
|
'yiisoft/yii2-bootstrap' => array(
|
