diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-09-17 12:07:42 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-09-17 12:07:42 +0000 |
| commit | 8926038591a2c290580f13cbb5d8581d0f7861e5 (patch) | |
| tree | c029a7223020cbe992a512dd3cb8cd3c0c351e39 /lib/ocs.php | |
| parent | 0f07226270d02ba7b8b1da8247cdbcb206a6c744 (diff) | |
| download | nextcloud-server-8926038591a2c290580f13cbb5d8581d0f7861e5.tar.gz nextcloud-server-8926038591a2c290580f13cbb5d8581d0f7861e5.zip | |
API: Fix merge conflict remnants
Diffstat (limited to 'lib/ocs.php')
| -rw-r--r-- | lib/ocs.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ocs.php b/lib/ocs.php index 6cdb2480860..1cec3ecc7c0 100644 --- 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(); |