wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API: Fix merge conflict remnants

Browse source
This commit is contained in:
Tom Needham 2012-09-17 12:07:42 +00:00
parent 0f07226270
commit 8926038591
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ocs.php
View file

@ -82,7 +82,6 @@ class OC_OCS {
echo('internal server error: method not supported');
exit();
}
<<<<<<< HEAD
$format = self::readData($method, 'format', 'text', '');
$txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
$txt.=OC_OCS::getDebugOutput();