API: Fix merge conflict remnants

13 years ago · 8926038591
parent 0f07226270
commit 8926038591
1 changed files with 0 additions and 1 deletions
--- a/lib/ocs.php
+++ b/lib/ocs.php
@ -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();