summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorTyler Swagar2017-11-13 15:49:36 -0800
committerTyler Swagar2017-11-13 15:49:36 -0800
commit5758f0ce91591fc80953cd1f6e7aecc68ee676ab (patch)
treea87db4e24581b06096529ee1142f463578964ab4 /PKGBUILD
parent39b71fd0a7eb662d9ae58ec356f047fdd90d91af (diff)
downloadaur-5758f0ce91591fc80953cd1f6e7aecc68ee676ab.tar.gz
Remove conflict with ttf-google-fonts-git
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d96c48c0dd8b..77437dec6313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ arch=('any')
url='https://fonts.google.com/specimen/Oswald'
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' 'otf-oswald-ib')
+conflicts=('ttf-google-fonts-opinionated-git' 'otf-oswald-ib')
source=("Oswald-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/oswald/Oswald-Bold.ttf"
"Oswald-ExtraLight-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/oswald/Oswald-ExtraLight.ttf"
"Oswald-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/oswald/Oswald-Light.ttf"