[DRE-commits] [ruby-bootstrap-sass] 02/04: conflict with ruby-bootstrap-sass

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch diaspora
in repository ruby-bootstrap-sass.

commit ff589a05809e35db62ff2a1b44fed1441bedb679
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 12 22:54:18 2015 +0530

    conflict with ruby-bootstrap-sass
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 04b49a5..c5545f1 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
   ruby-sass (>=3.2~)
 Suggests: ruby-sass-rails (>= 3.2~)
+Conflicts: ruby-bootstrap-sass
 Description: Twitter's Bootstrap, converted to Sass
  `bootstrap-sass` is an Sass-powered version of Twitter's Bootstrap, ready 
  to drop right into your Sass powered applications.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-bootstrap-sass.git