From 29479bae57a093b5927e78ba9c795270889b4424 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Fri, 9 Oct 2015 14:11:34 +0200
Subject: [PATCH] base-voidstrap: there's no reason to conflict with
 base-system.

Both packages can be installed at the same time.
---
 srcpkgs/base-voidstrap/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template
index bad86652da3..d4775719b9f 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-voidstrap/template
@@ -1,15 +1,13 @@
 # Template file for 'base-voidstrap'
 pkgname=base-voidstrap
-version=0.8
-revision=2
+version=0.9
+revision=1
 build_style=meta
 homepage="http://www.voidlinux.eu/"
 short_desc="Void Linux base system meta package for containers/chroots"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Public domain"
 
-conflicts="base-system>=0"
-
 depends="
  base-files ncurses coreutils findutils diffutils
  dash bash grep gzip file sed gawk less util-linux which tar man-pages