You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/18 15:39:23 UTC
[isis] 02/02: ISIS-2751: fixes rebase edit issue
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2751
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c4923307e21cd10a4e38de4bac0b2ece0206d9f6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 18 16:23:37 2021 +0100
ISIS-2751: fixes rebase edit issue
---
.../isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 3527d32..a3eee67 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -53,9 +53,6 @@ import org.apache.isis.testdomain.conf.Configuration_headless;
import lombok.Getter;
import lombok.val;
-=======
- >>>>>>>4dd5fb2460(ISIS-2751:fixes ModuleWithFixturesService)
-
@SpringBootTest(
classes = {
Configuration_headless.class,