From d207e7090d9160b2a5e4ae5e202dd05641bc3cf8 Mon Sep 17 00:00:00 2001
From: Diogo Leal <diogo@diogoleal.com>
Date: Sat, 8 Aug 2015 23:34:50 -0300
Subject: [PATCH] jupp: add conflicts=joe

---
 srcpkgs/jupp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/jupp/template b/srcpkgs/jupp/template
index 59275297f8..a287976c7e 100644
--- a/srcpkgs/jupp/template
+++ b/srcpkgs/jupp/template
@@ -1,10 +1,11 @@
 # Template file for 'jupp'
 pkgname=jupp
 version=3.1jupp28
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-termidx"
 makedepends="ncurses-devel"
+conflicts="joe>=0"
 wrksrc="jupp"
 conf_files="
 	/etc/joe/joerc