resolve conflicts

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
This commit is contained in:
Jonas Sulzer
2019-01-05 00:00:31 +01:00
parent 4eea136bf2
commit ecef285f41

View File

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