From 1cc5c5ee8edb9b4b021c8f938fa32ad3fe62f0fb Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 15 Oct 2010 03:31:48 +0000
Subject: [PATCH] MINOR Fixed merge error

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112579 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/LeftAndMain.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 543e2884..15ad5153 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -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);