summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1c0feb893e9..6c8f25cc9663 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Dec 27 18:26:38 UTC 2015
+# Mon Dec 28 03:22:48 UTC 2015
pkgbase = powerline-fonts-git
pkgdesc = Powerline fonts for X11 and the console
pkgver = r100.a44abd0
@@ -32,6 +32,7 @@ pkgbase = powerline-fonts-git
conflicts = ttf-dejavusansmono-powerline-git
conflicts = ttf-droid-sans-mono-dotted-powerline-git
conflicts = ttf-droid-sans-mono-slashed-powerline-git
+ conflicts = ttf-hack
conflicts = ttf-hack-powerline-git
conflicts = ttf-inconsolata-dz-powerline
conflicts = ttf-liberation-mono-powerline-git
diff --git a/PKGBUILD b/PKGBUILD
index e547e4dc61ff..93a2c8d28de6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,6 +30,7 @@ conflicts=(
ttf-dejavusansmono-powerline-git
ttf-droid-sans-mono-dotted-powerline-git
ttf-droid-sans-mono-slashed-powerline-git
+ ttf-hack
ttf-hack-powerline-git
ttf-inconsolata-dz-powerline
ttf-liberation-mono-powerline-git