[Pkg-owncloud-commits] [php-sabredav] 01/02: Revert "Conflict with php-sabre-http"

[David Prévot]

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

taffit pushed a commit to branch 1.8
in repository php-sabredav.

commit 039a589ebb6c5c2a3679861673221096fda9bd51
Author: David Prévot <taffit at debian.org>
Date:   Sun Jul 20 15:02:49 2014 -0400

    Revert "Conflict with php-sabre-http"
    
    This reverts commit d0f7009a83705b7bdc445ce390a6e2708a5c7c68.
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index fac1bf3..1112f63 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
 Suggests: ${phpcomposer:Debian-suggest}
 Replaces: php-horde-dav (<< 1.0.4-1+)
 Breaks: php-horde-dav (<< 1.0.4-1+)
-Conflicts: php-sabre-http
 Description: ${phpcomposer:description}
  SabreDAV is meant to cover the entire standard, and attempts to allow
  integration using an easy to understand API.

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