diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
| commit | edb04b25dea733e0ac3a1f87c55cfd368dcdf731 (patch) | |
| tree | e8b951b8162955d7f2282c83d06cf803e61396f3 /3rdparty/Sabre/DAV/Locks | |
| parent | 7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 (diff) | |
| parent | b3848581bf5f77008a71cf79ba6e3d61b33baed6 (diff) | |
| download | nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.tar.gz nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.zip | |
Fix merge conflicts
Diffstat (limited to '3rdparty/Sabre/DAV/Locks')
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/Backend/FS.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/Backend/File.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/Backend/PDO.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/LockInfo.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdparty/Sabre/DAV/Locks/Plugin.php | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php index 127e643a2b9..127e643a2b9 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php +++ b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php index 02cab87fc82..02cab87fc82 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/Backend/FS.php +++ b/3rdparty/Sabre/DAV/Locks/Backend/FS.php diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php index c33f963514b..c33f963514b 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/Backend/File.php +++ b/3rdparty/Sabre/DAV/Locks/Backend/File.php diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php index acce80638ec..acce80638ec 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php +++ b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php index 9df014a4281..9df014a4281 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/LockInfo.php +++ b/3rdparty/Sabre/DAV/Locks/LockInfo.php diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php index fd956950b8a..fd956950b8a 100644..100755 --- a/3rdparty/Sabre/DAV/Locks/Plugin.php +++ b/3rdparty/Sabre/DAV/Locks/Plugin.php |