From 2285fc86ba83ac420c01ecc2b570995f2bd36346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jul 2021 06:48:04 +0700
Subject: [PATCH] fonts-droid-ttf: no longer conflicts with google-fonts-ttf

---
 srcpkgs/fonts-droid-ttf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template
index f93c9b65cff..44ef45a8052 100644
--- a/srcpkgs/fonts-droid-ttf/template
+++ b/srcpkgs/fonts-droid-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'fonts-droid-ttf'
 pkgname=fonts-droid-ttf
 version=20150613
-revision=2
+revision=3
 _githash=f5de525ee3547b8a69a21aec1e1a3175bc06f442
 create_wrksrc=yes
 depends="font-util"
@@ -12,7 +12,6 @@ homepage="http://www.droidfonts.com/droidfonts/"
 changelog="https://android.googlesource.com/platform/frameworks/base/+log/master/data/fonts"
 distfiles="https://android.googlesource.com/platform/frameworks/base/+archive/${_githash}/data/fonts.tar.gz"
 checksum=@722c954d839cc131c17161956c5117624ceeea3f90e01d4d8ad3d38f374000cc
-conflicts="google-fonts-ttf"
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {