Remove conflict with ttf-google-fonts-git

2 files changed, 2 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a25a3876362..44779f47cd65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Oct 31 20:46:47 UTC 2017
+# Mon Nov 13 23:44:11 UTC 2017
 pkgbase = ttf-oswald
 	pkgdesc = Sans-serif typeface from Google by Vernon Adams
 	pkgver = 4.100
@@ -10,7 +10,6 @@ pkgbase = ttf-oswald
 	depends = fontconfig
 	depends = xorg-fonts-encodings
 	depends = xorg-font-utils
-	conflicts = ttf-google-fonts-git
 	conflicts = ttf-google-fonts-opinionated-git
 	conflicts = otf-oswald-ib
 	source = Oswald-Bold-4.100.ttf::https://github.com/google/fonts/raw/1e5d467208dd1306173960dc7b176686d630f307/ofl/oswald/Oswald-Bold.ttf
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"