From ecef285f41aa9d615379448efc5e9415160910cf Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Sat, 5 Jan 2019 00:00:31 +0100
Subject: [PATCH] resolve conflicts

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 appinfo/info.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index af303bb..d51c75a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,11 +16,10 @@
 	<bugs>https://github.com/nextcloud/user_external/issues</bugs>
 	<repository type="git">https://github.com/nextcloud/user_external.git</repository>
 	<dependencies>
-		<nextcloud min-version="13" max-version="15" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 	<types>
 		<authentication/>
 		<prelogin/>
 	</types>
-	<shipped>true</shipped>
 </info>