From 7a3b331a07669790611905576d0e4bbe4de6aa11 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 18 Sep 2023 13:42:11 +0200
Subject: [PATCH] [Project] Remove default privilegeConflictResolution value

---
 example/config/PrivilegeConfig.xml                               | 1 -
 .../src/test/resources/test-runtime/config/PrivilegeConfig.xml   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/example/config/PrivilegeConfig.xml b/example/config/PrivilegeConfig.xml
index d4d9c7b..39e35df 100644
--- a/example/config/PrivilegeConfig.xml
+++ b/example/config/PrivilegeConfig.xml
@@ -6,7 +6,6 @@
             <Parameter name="secretSalt" value="CHANGE-ME"/>
             <Parameter name="persistSessions" value="true"/>
             <Parameter name="autoPersistOnUserChangesData" value="true"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
             <Parameter name="allowSessionRefresh" value="true"/>
         </Parameters>
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml b/plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml
index 2819f18..16fe933 100644
--- a/plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml
+++ b/plc-core/src/test/resources/test-runtime/config/PrivilegeConfig.xml
@@ -9,7 +9,6 @@
             <Parameter name="secretSalt" value="changeMe"/>
             <Parameter name="persistSessions" value="true"/>
             <Parameter name="autoPersistOnUserChangesData" value="false"/>
-            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">