[SCM] devede/master: s/Conflicts/Breaks/

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43e54dd79b15f3df54fa458c8ab34e4e9e30b234
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Apr 17 10:14:16 2012 +0200

    s/Conflicts/Breaks/

diff --git a/debian/control b/debian/control
index 1c73d66..73d3c50 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Depends:
  ${python:Depends}
 Recommends:
  devede
-Conflicts:
+Breaks:
  devede (<< 3.21.0-2~)
 Replaces:
  devede (<< 3.21.0-2~)

-- 
devede packaging