Skip to content

Commit 4e4b847

Browse files
igdianovigdianov
committed
fix: merge conflicts
1 parent 5a1638a commit 4e4b847

File tree

4 files changed

+2
-29
lines changed
  • graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars
  • graphql-jpa-query-example-model-books
  • graphql-jpa-query-example-model-starwars

4 files changed

+2
-29
lines changed

‎graphql-jpa-query-example-model-books/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.introproventures</groupId>
55
<artifactId>graphql-jpa-query-build</artifactId>
6-
<version>0.3.19-SNAPSHOT</version>
6+
<version>0.3.20-SNAPSHOT</version>
77
<relativePath>../graphql-jpa-query-build</relativePath>
88
</parent>
99
<artifactId>graphql-jpa-query-example-model-books</artifactId>

‎graphql-jpa-query-example-model-starwars/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.introproventures</groupId>
55
<artifactId>graphql-jpa-query-build</artifactId>
6-
<version>0.3.19-SNAPSHOT</version>
6+
<version>0.3.20-SNAPSHOT</version>
77
<relativePath>../graphql-jpa-query-build</relativePath>
88
</parent>
99

‎graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/model/starwars/DroidFunction.java renamed to ‎graphql-jpa-query-example-model-starwars/src/main/java/com/introproventures/graphql/jpa/query/schema/model/starwars/DroidFunction.java

File renamed without changes.

‎graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/DroidFunction.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)