[isis-app-simpleapp] branch jdo-SNAPSHOT updated: fixes merge conflict

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git


The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
     new cc4300a  fixes merge conflict
cc4300a is described below

commit cc4300a485c5a918bcf9a6b1a958fad2c423d229
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Nov 22 06:35:34 2022 +0100

    fixes merge conflict
---
 webapp/src/main/java/domainapp/webapp/AppManifest.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java 
b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index 2cd3c88..2ab24dc 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -19,8 +19,8 @@ import 
org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketU
 import 
org.apache.causeway.extensions.secman.encryption.jbcrypt.CausewayModuleExtSecmanEncryptionJbcrypt;
 import 
org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
 import 
org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
-import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
 import 
org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
+import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
 import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleusMixins;
 import 
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
 import 
org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
@@ -41,14 +41,10 @@ import domainapp.webapp.quartz.QuartzModule;
         CausewayModuleApplibChangeAndExecutionLoggers.class,
 
         CausewayModuleCoreRuntimeServices.class,
-<<<<<<< HEAD
         CausewayModulePersistenceJdoDatanucleus.class,
         CausewayModulePersistenceJdoDatanucleusMixins.class,
-        CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
-=======
-        CausewayModulePersistenceJpaEclipselink.class,
+
         CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
->>>>>>> refs/remotes/origin/jpa-SNAPSHOT
         CausewayModuleViewerWicketApplibMixins.class,
         CausewayModuleViewerWicketViewer.class,