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
commit dac4f85753ae3b32e46210589897e81f2b561377 Merge: 0d04ba8 ffe33c7 Author: Andi Huber <[email protected]> AuthorDate: Mon Nov 14 19:33:09 2022 +0100 config was restructured (framework) .../webapp/integtests/metamodel/SwaggerExport_IntegTest.java | 7 +++---- webapp/src/main/java/domainapp/webapp/AppManifest.java | 7 ++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java index e773816,f1ef920..2cd3c88 --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@@ -41,9 -40,8 +41,14 @@@ import domainapp.webapp.quartz.QuartzMo CausewayModuleApplibChangeAndExecutionLoggers.class, CausewayModuleCoreRuntimeServices.class, ++<<<<<<< HEAD + CausewayModulePersistenceJdoDatanucleus.class, + CausewayModulePersistenceJdoDatanucleusMixins.class, + CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class, ++======= + CausewayModulePersistenceJpaEclipselink.class, + CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, ++>>>>>>> refs/remotes/origin/jpa-SNAPSHOT CausewayModuleViewerWicketApplibMixins.class, CausewayModuleViewerWicketViewer.class,
