Skip to content

Commit

Permalink
MINOR Fixed merge error
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112579 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
chillu committed Oct 15, 2010
1 parent 66f2fad commit 1cc5c5e
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions code/LeftAndMain.php
Expand Up @@ -307,14 +307,6 @@ function init() {
)
);

Requirements::combine_files(
'cmsmain.js',
array(
'cms/javascript/CMSMain_left.js',
'cms/javascript/CMSMain_right.js',
)
);

$dummy = null;
$this->extend('init', $dummy);

Expand Down

0 comments on commit 1cc5c5e

Please sign in to comment.