summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorTyler Swagar2017-01-12 02:33:46 -0800
committerTyler Swagar2017-01-12 02:33:46 -0800
commit3016860227f716c26dea81e54ac6048ff77bb889 (patch)
treee66c4ab3b5b5d5829174253cbc6414491cd97417 /PKGBUILD
parent99c7190a311bd333715db93a0654bbc9ac17aee4 (diff)
downloadaur-3016860227f716c26dea81e54ac6048ff77bb889.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 ee0d8b0a111..9f43743610c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,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')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git')
install="${pkgname}.install"
source=('https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf'
'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf'