remove 25

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

.github/workflows/psalm.yml

@@ -20,14 +20,11 @@ concurrency:
 jobs:
   static-analysis:
     runs-on: ubuntu-latest
-<<<<<<< master:.github/workflows/psalm.yml
-=======
     strategy:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25' ]
+        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26' ]
->>>>>>> feat(deps): Add Nextcloud 28 support:.github/workflows/psalm-matrix.yml
 
     name: Nextcloud
     steps:

appinfo/info.xml

@@ -35,11 +35,7 @@
 		<database>pgsql</database>
 		<database>sqlite</database>
 		<database>mysql</database>
-<<<<<<< master
+		<nextcloud min-version="26" max-version="27"/>
-		<nextcloud min-version="27" max-version="27"/>
-=======
-		<nextcloud min-version="25" max-version="27"/>
->>>>>>> feat(deps): Add Nextcloud 28 support
 	</dependencies>
 
 	<background-jobs>