From 6a6d4c3dead92b3a23090ad62604c2bad9fe8236 Mon Sep 17 00:00:00 2001
From: freaj <freaj@riseup.net>
Date: Thu, 19 Mar 2015 17:35:27 +0100
Subject: freefilesync-6.14-0: updating PKGBUILD

---
 pcr/freefilesync/PKGBUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pcr/freefilesync/PKGBUILD b/pcr/freefilesync/PKGBUILD
index 182fd13b7..5a2eba50f 100644
--- a/pcr/freefilesync/PKGBUILD
+++ b/pcr/freefilesync/PKGBUILD
@@ -11,7 +11,6 @@ arch=('any')
 url="http://sourceforge.net/projects/freefilesync/"
 license=('GPLv3')
 depends=(wxgtk webkitgtk2 boost)
-conflicts=(freefilesync-ubuntu)
 source=("http://downloads.sourceforge.net/project/zenxml/zenXml_2.1.zip"
 	"http://downloads.sourceforge.net/project/freefilesync/FreeFileSync/$pkgver/FreeFileSync_${pkgver}_Source.zip" 
 	FreeFileSync.desktop 
-- 
cgit v1.2.3