diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
| commit | 2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9 (patch) | |
| tree | f25b463c90992764887416c3082098fed6ecac65 /3rdparty/Sabre/DAV/Property/IHref.php | |
| parent | 40f95ffdf3edf9ab45c15bd5b9018d7f4d92baa9 (diff) | |
| parent | 127796218314c6b1f19ba86f74caa913375aac8d (diff) | |
| download | nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.tar.gz nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.zip | |
fix merge conflicts
Diffstat (limited to '3rdparty/Sabre/DAV/Property/IHref.php')
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Property/IHref.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php index 29d76a44fcd..5c0409064cb 100644..100755 --- a/3rdparty/Sabre/DAV/Property/IHref.php +++ b/3rdparty/Sabre/DAV/Property/IHref.php @@ -9,16 +9,16 @@ * * @package Sabre * @subpackage DAV - * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved. - * @author Evert Pot (http://www.rooftopsolutions.nl/) + * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved. + * @author Evert Pot (http://www.rooftopsolutions.nl/) * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License */ interface Sabre_DAV_Property_IHref { /** - * getHref - * - * @return string + * getHref + * + * @return string */ function getHref(); |