Permalink
Browse files

MINOR Fixed merge error

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102485 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 444e192 commit 8a0f639977c8e420997fcf3aeeab080acc791d13 @chillu chillu committed Apr 12, 2010
Showing with 1 addition and 9 deletions.
  1. +1 −9 code/CMSBatchAction.php
View
@@ -192,15 +192,7 @@ function run(DataObjectSet $pages) {
}
}
-<<<<<<< .working
return Convert::raw2json($status);
-=======
-
- return FormResponse::respond();
->>>>>>> .merge-right.r96789
}
-}
-
-
-
+}

0 comments on commit 8a0f639

Please sign in to comment.