2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 567622ac1529..9ca7f168fc21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = csstidy
 	pkgdesc = A program that optimises, formats and fixes CSS code
 	pkgver = 1.4
-	pkgrel = 2
+	pkgrel = 3
 	url = http://sourceforge.net/projects/csstidy/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = scons
 	depends = gcc-libs
+	conflicts = csstidy-cpp-git
 	source = http://downloads.sourceforge.net/project/csstidy/CSSTidy%20%28C%2B%2B%2C%20stable%29/1.3/csstidy-source-1.4.zip
 	source = gcc43fix.diff
 	md5sums = 8fcbf5c1c3cafd9232552b3286aabcb9
diff --git a/PKGBUILD b/PKGBUILD
index ec9ef71b3a92..aa0a733fbba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
 # Contributor: Sergey Kish <sergey.kish@gmail.com>
+# Contributor: itsme <mymail@ishere.ru>
 
 pkgname=csstidy
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A program that optimises, formats and fixes CSS code"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/csstidy/"
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('scons')
+conflicts=('csstidy-cpp-git')
 source=(http://downloads.sourceforge.net/project/csstidy/CSSTidy%20%28C%2B%2B%2C%20stable%29/1.3/csstidy-source-$pkgver.zip
         'gcc43fix.diff')
 md5sums=('8fcbf5c1c3cafd9232552b3286aabcb9'