From 81b117d2ec4df21210a28552eecc17d71c0be995 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 4 Oct 2018 00:01:37 -0400
Subject: [PATCH] noto-fonts-cjk: remove conflict with google-fonts-ttf

Fixes #3393
---
 srcpkgs/noto-fonts-cjk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/noto-fonts-cjk/template b/srcpkgs/noto-fonts-cjk/template
index d92fafe1cc0..3cd899a64a7 100644
--- a/srcpkgs/noto-fonts-cjk/template
+++ b/srcpkgs/noto-fonts-cjk/template
@@ -1,7 +1,7 @@
 # Template build file for 'noto-fonts-cjk'
 pkgname=noto-fonts-cjk
 version=20170601
-revision=1
+revision=2
 noarch="yes"
 _githash=32a5844539f2e348ed36b44e990f9b06d7fb89fe
 wrksrc="noto-cjk-${_githash}"
@@ -14,7 +14,6 @@ license="OFL-1.1"
 homepage="https://www.google.com/get/noto/"
 distfiles="https://github.com/googlei18n/noto-cjk/archive/${_githash}.tar.gz"
 checksum=dfd40932647ca15f610ee97fdff1c8bf5e2864f0db6f50ac245f2f284c92f92a
-conflicts="google-fonts-ttf>=0"
 
 do_install() {
 	vmkdir usr/share/fonts/noto