diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 14:23:41 +0400 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 14:23:41 +0400 |
| commit | 227ada32576b7b9de56efe1f5d9ae96c6493be52 (patch) | |
| tree | 41f3a88fb646488e043ba638e92e7f313d2cb64c /ocs | |
| parent | fa5dff22a02aeb5985215454549ab1020382b197 (diff) | |
| parent | 5a149dcfab960fe21c2df1bf4f1ba27f1a10b2c8 (diff) | |
Fix merge conflicts
Diffstat (limited to 'ocs')
| -rw-r--r-- | ocs/providers.php | 4 | ||||
| -rw-r--r-- | ocs/v1.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ocs/providers.php b/ocs/providers.php index cc6de32266b..4c68ded914e 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -21,9 +21,9 @@ * */ -require_once('../lib/base.php'); +require_once '../lib/base.php'; -$url='http://'.substr(OCP\Util::getServerHost().$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/'; +$url='http://'.substr(OCP\Util::getServerHost().$_SERVER['REQUEST_URI'], 0, -17).'ocs/v1.php/'; echo(' <providers> diff --git a/ocs/v1.php b/ocs/v1.php index ce6bad3d450..ac1312afb67 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -32,3 +32,4 @@ try { } catch (MethodNotAllowedException $e) { OC_Response::setStatus(405); } + |