From 36380b7e07b8d054669a1f9bbb07c6a698cfae77 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 9 Jun 2023 17:26:37 -0100
Subject: [PATCH] remove 25

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 .github/workflows/psalm.yml | 5 +----
 appinfo/info.xml            | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index bfe90900..771b6107 100644
--- a/.github/workflows/psalm.yml
+++ b/.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' ]
->>>>>>> feat(deps): Add Nextcloud 28 support:.github/workflows/psalm-matrix.yml
+        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26' ]
 
     name: Nextcloud
     steps:
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 79d7b9d7..e7f870d8 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -35,11 +35,7 @@
 		<database>pgsql</database>
 		<database>sqlite</database>
 		<database>mysql</database>
-<<<<<<< master
-		<nextcloud min-version="27" max-version="27"/>
-=======
-		<nextcloud min-version="25" max-version="27"/>
->>>>>>> feat(deps): Add Nextcloud 28 support
+		<nextcloud min-version="26" max-version="27"/>
 	</dependencies>
 
 	<background-jobs>