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 2019/01/11 10:16:51 UTC
[isis] 03/03: Merge branch 'master' into v2
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1dd23cb9f41fdebe3bae57437708f68f54106f70
Merge: 2f3e4f8 c79b2bb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 11 10:01:14 2019 +0000
Merge branch 'master' into v2
# Conflicts:
# example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
.../helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java | 1 -
1 file changed, 1 deletion(-)
diff --cc example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index 28e1e7d,4e5824a..2f259bd
--- a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@@ -25,8 -25,9 +25,7 @@@ import javax.jdo.JDOQLTypedQuery
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
- import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;