summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO3
1 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7be9a6b46e04..a27a03049dcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jan 9 22:23:23 UTC 2017
+# Wed Jan 11 02:33:47 UTC 2017
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 1.583
@@ -11,6 +11,7 @@ pkgbase = ttf-merriweather
depends = fontconfig
depends = xorg-fonts-encodings
depends = xorg-font-utils
+ conflicts = ttf-google-fonts-git
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Bold.ttf