resolve conflicts

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2019-01-05 00:00:31 +01:00
parent 4eea136bf2
commit ecef285f41
1 changed files with 1 additions and 2 deletions
--- 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>