fix: merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-12-20 21:41:47 +01:00
parent 21c4955001
commit be27d3ed01
5 changed files with 6 additions and 34 deletions
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -53,8 +53,7 @@ class Capabilities implements ICapability {
 				'canCreateBoards' => $this->permissionService->canCreate(),
 				'apiVersions' => [
 					'1.0',
-					'1.1',
-					'1.2'
+					'1.1'
 				]
 			]
 		];