diff options
| author | Tyler Swagar | 2017-11-13 15:49:09 -0800 |
|---|---|---|
| committer | Tyler Swagar | 2017-11-13 15:49:09 -0800 |
| commit | 49c35b1828702cebd31a5ad256fde01f2d9d2fd3 (patch) | |
| tree | 31c01985091e89751327a60bbc43a03855a3f30c | |
| parent | 3bc411e7f08f4106f4bec84670f3b506cab9222d (diff) | |
| download | aur-49c35b1828702cebd31a5ad256fde01f2d9d2fd3.tar.gz | |
Remove conflict with ttf-google-fonts-git
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Thu Jun 1 19:41:53 UTC 2017 +# Mon Nov 13 23:42:58 UTC 2017 pkgbase = ttf-merriweather-sans pkgdesc = A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co pkgver = 1.006 @@ -10,7 +10,6 @@ pkgbase = ttf-merriweather-sans depends = fontconfig depends = xorg-fonts-encodings depends = xorg-font-utils - conflicts = ttf-google-fonts-git conflicts = ttf-google-fonts-opinionated-git conflicts = ttf-merriweather-sans-ib source = MerriweatherSans-Bold-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Bold.ttf @@ -9,7 +9,7 @@ arch=('any') url='https://fonts.google.com/specimen/Merriweather+Sans' license=('custom:SIL Open Font License v1.1') depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils') -conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-sans-ib') +conflicts=('ttf-google-fonts-opinionated-git' 'ttf-merriweather-sans-ib') source=("MerriweatherSans-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-Bold.ttf" "MerriweatherSans-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf" "MerriweatherSans-ExtraBold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf" |