You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/01/18 10:59:42 UTC
(causeway) 02/02: CAUSEWAY-3676: CAUSEWAY-3678 : fix after merge
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 0e1ddfd88c2c9e9635dac03671b49bde9ef0c9bd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 18 10:57:59 2024 +0000
CAUSEWAY-3676: CAUSEWAY-3678 : fix after merge
---
.../commons/CausewayModulePersistenceCommons.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
index 47a35c6d50..0fc4fca708 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
@@ -18,15 +18,17 @@
*/
package org.apache.causeway.persistence.commons;
-<<<<<<< Updated upstream
-=======
import org.apache.causeway.persistence.commons.integration.repository.RepositoryServiceDefault;
import org.apache.causeway.persistence.commons.integration.version.EntityVersionAccessor;
import org.apache.causeway.persistence.commons.integration.version.EntityVersionAccessorDefault;
import org.springframework.context.annotation.Bean;
->>>>>>> Stashed changes
+
+import org.apache.causeway.persistence.commons.integration.version.EntityVersionAccessor;
+import org.apache.causeway.persistence.commons.integration.version.EntityVersionAccessorDefault;
+
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -42,12 +44,6 @@ import org.apache.causeway.persistence.commons.integration.changetracking.PreAnd
// @Service's
EntityChangeTrackerDefault.class,
PreAndPostValueEvaluatorServiceDefault.class,
-<<<<<<< Updated upstream
-})
-public class CausewayModulePersistenceCommons {
-
-=======
- EntityVersionAccessorDefault.class,
// @Repository's
RepositoryServiceDefault.class,
@@ -56,7 +52,4 @@ public class CausewayModulePersistenceCommons {
public class CausewayModulePersistenceCommons {
public static final String NAMESPACE = "causeway.persistence.commons";
-
-
->>>>>>> Stashed changes
}