summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO3
1 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f582493ec4a0..1a5a1d61d66b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Oct 31 20:43:26 UTC 2017
+# Mon Nov 13 23:38:50 UTC 2017
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 2.002
@@ -11,7 +11,6 @@ pkgbase = ttf-merriweather
depends = fontconfig
depends = xorg-fonts-encodings
depends = xorg-font-utils
- conflicts = ttf-google-fonts-git
conflicts = ttf-google-fonts-opinionated-git
conflicts = ttf-merriweather-ib
source = Merriweather-Black-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Black.ttf