add xmobar-git to conflict list

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35e5294eca76..58c522a11232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,6 +35,7 @@ pkgbase = xmobar-alsa-git
 	depends = haskell-extensible-exceptions
 	provides = xmobar
 	conflicts = xmobar
+	conflicts = xmobar-git
 	source = xmobar-alsa-git::git+https://github.com/jaor/xmobar.git
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 165e6f5cf3f5..f1a7c062e4c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ depends=('libxft' 'libxinerama' 'libxrandr' 'libxpm' 'ghc-libs' 'haskell-x11'
          'wireless_tools' 'haskell-text' 'haskell-async' 'haskell-alsa-core'
          'haskell-alsa-mixer' 'haskell-extensible-exceptions')
 makedepends=('git' 'ghc')
-conflicts=('xmobar')
+conflicts=('xmobar' 'xmobar-git')
 provides=('xmobar')
 source=(${pkgname}::git+https://github.com/jaor/xmobar.git)
 sha512sums=('SKIP')