summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorTyler Swagar2017-01-12 02:32:07 -0800
committerTyler Swagar2017-01-12 02:32:07 -0800
commit05a2205323e44e0f30fc44cbb74c739613d0870b (patch)
tree736467897719f28c7f254c6365f42846dfa9b0b7 /PKGBUILD
parent1847fb5a1d5cd04c4839f580655dea8876ab6db1 (diff)
downloadaur-05a2205323e44e0f30fc44cbb74c739613d0870b.tar.gz
Add conflict with ttf-google-fonts-opinionated-git
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 69c4023c0e3..e4ca1f8777b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
url='https://fonts.google.com/specimen/Merriweather'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-conflicts=('ttf-google-fonts-git')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git')
install="${pkgname}.install"
source=('https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf'
'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf'