[isis-app-helloworld] branch jpa-SNAPSHOT updated: fixes merge issue

[danhaywood]

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

danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git


The following commit(s) were added to refs/heads/jpa-SNAPSHOT by this push:
     new 0594f3c  fixes merge issue
0594f3c is described below

commit 0594f3c6098dea797224d98d0132642f1145a8c5
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Fri May 14 09:35:27 2021 +0100

    fixes merge issue
---
 src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java 
b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 05e4115..eb48032 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -11,6 +11,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.annotation.Publishing;
 import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;