tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-02 14:18:47 +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@102485 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 10:05:08 +00:00
parent 444e192068
commit 8a0f639977
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/CMSBatchAction.php
View File

@ -192,15 +192,7 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
}
}
<<<<<<< .working
return Convert::raw2json($status);
=======
return FormResponse::respond();
>>>>>>> .merge-right.r96789
}
}
}