From a024965bd820de4a606277c00d0bea600320457b Mon Sep 17 00:00:00 2001 From: "b.ulrich" <b.ulrich@adito.de> Date: Fri, 6 Mar 2020 10:14:53 +0100 Subject: [PATCH] Upgraded Datamodels of ObjectProxy and QuickEntry after ConflictResolving --- neonContext/ObjectProxy/ObjectProxy.aod | 2 +- neonContext/QuickEntry/QuickEntry.aod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neonContext/ObjectProxy/ObjectProxy.aod b/neonContext/ObjectProxy/ObjectProxy.aod index ee051edd7a0..4f06534bc12 100644 --- a/neonContext/ObjectProxy/ObjectProxy.aod +++ b/neonContext/ObjectProxy/ObjectProxy.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0"> +<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> <name>ObjectProxy</name> <majorModelMode>DISTRIBUTED</majorModelMode> <entity>ObjectProxy_entity</entity> diff --git a/neonContext/QuickEntry/QuickEntry.aod b/neonContext/QuickEntry/QuickEntry.aod index c64564beb9a..c05110cb014 100644 --- a/neonContext/QuickEntry/QuickEntry.aod +++ b/neonContext/QuickEntry/QuickEntry.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0"> +<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> <name>QuickEntry</name> <title>Quick entry</title> <majorModelMode>DISTRIBUTED</majorModelMode> -- GitLab