From a979c86e9e0788c631c59fcc7a474070860f49e0 Mon Sep 17 00:00:00 2001
From: neodarz <neodarz@neodarz.net>
Date: Thu, 2 Nov 2017 16:39:17 +0100
Subject: Fix conflicts

---
 .SRCINFO | 6 ++++--
 PKGBUILD | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 030e4e5..95b80f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = terminalimageviewer
 	pkgdesc = Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters
 	pkgver = r46.65ebc0a
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/stefanhaustein/TerminalImageViewer
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = git
 	provides = TerminalImageViewer
-	conflicts = TerminalImageViewer, tiv
+	provides = tiv
+	conflicts = TerminalImageViewer
+	conflicts = tiv
 	source = terminalimageviewer-git::git+https://github.com/stefanhaustein/TerminalImageViewer.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index fd69fd7..a86d7a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@ pkgbase=terminalimageviewer
 pkgname=terminalimageviewer-git
 _pkgname=TerminalImageViewer
 pkgver=r46.65ebc0a
-pkgrel=1
+pkgrel=2
 pkgdesc="Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"
 arch=('i686' 'x86_64')
 url="https://github.com/stefanhaustein/$_pkgname"
 license=('Apache')
 makedepends=(git)
-provides=("$_pkgname")
-conflicts=("$_pkgname, tiv")
+provides=("$_pkgname" "tiv")
+conflicts=("$_pkgname" "tiv")
 source=("$pkgname"::"git+https://github.com/stefanhaustein/$_pkgname.git")
 noextract=()
 md5sums=('SKIP')
-- 
cgit v1.2.1