fix issue after resolving merge conflicts

Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Jan 18, 2023 · 22b6b02 · 22b6b02
1 parent 074e6f2
commit 22b6b02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,6 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - drop support for Nextcloud 21 and 22
 
-- Use session locking to be compatible with Nextcloud 25 during logout
-
 ## 5.1.2
 
 ### Fixed

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -143,8 +143,8 @@ public function getForm() {
 			'group_mapping_prefix' => [
 				'text' => $this->l10n->t('Group Mapping Prefix, default: %s', [SAMLSettings::DEFAULT_GROUP_PREFIX]),
 				'type' => 'line',
-				required => true,
-
+				'required' => true,
+			],
 		];
 
 		$userFilterSettings = [