From 8a0f639977c8e420997fcf3aeeab080acc791d13 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 10:05:08 +0000 Subject: [PATCH] MINOR Fixed merge error git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102485 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSBatchAction.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php index d17240db..4228000f 100644 --- a/code/CMSBatchAction.php +++ b/code/CMSBatchAction.php @@ -192,15 +192,7 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction { } } -<<<<<<< .working return Convert::raw2json($status); -======= - - return FormResponse::respond(); ->>>>>>> .merge-right.r96789 } -} - - - +} \ No newline at end of file