tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed merge error

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112579 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-15 03:31:48 +00:00
parent 66f2fad70a
commit 1cc5c5ee8e
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/LeftAndMain.php
View File

@ -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; $dummy = null;
$this->extend('init', $dummy); $this->extend('init', $dummy);