[Pkg-owncloud-commits] [owncloud] 22/55: fix left-over from merge conflict

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v5.0.16RC1
in repository owncloud.

commit 84a5c28e0f970a0b2a6a0940f1761d637c2da540
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Mar 13 21:00:13 2014 +0100

    fix left-over from merge conflict
---
 apps/files_sharing/tests/api.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 3a55581..7fdbab3 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -535,8 +535,6 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-<<<<<<< HEAD
-=======
 	 * @brief test multiple shared folder if the path gets constructed correctly
 	 * @medium
 	 */
@@ -620,7 +618,6 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
->>>>>>> 9d32475... finally fix the paths for the OCS Share API
 	 * @brief test re-re-share of folder if the path gets constructed correctly
 	 * @medium
 	 */
@@ -895,7 +892,6 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-<<<<<<< HEAD
 	 * @param $user
 	 * @param bool $create
 	 * @param bool $password

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git