mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
MINOR Fixed merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112579 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
66f2fad70a
commit
1cc5c5ee8e
@ -307,14 +307,6 @@ class LeftAndMain extends Controller {
|
||||
)
|
||||
);
|
||||
|
||||
Requirements::combine_files(
|
||||
'cmsmain.js',
|
||||
array(
|
||||
'cms/javascript/CMSMain_left.js',
|
||||
'cms/javascript/CMSMain_right.js',
|
||||
)
|
||||
);
|
||||
|
||||
$dummy = null;
|
||||
$this->extend('init', $dummy);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user