commit b846a9ee7056e6504129580d0e174d7841b608c5
author rasa <fiammara@gmail.com> Mon Oct 14 16:34:08 2019 +0300
committer rasa <fiammara@gmail.com> Mon Oct 14 16:34:08 2019 +0300
tree def6d445bdbf3370c1302fd0406330caa973cdb0
parent 0b6a461d30c0cf83db8a8d047d2d8d783545e020

conflict solving

juneau-petstore-server/pom.xml

diff --git a/juneau-petstore-server/pom.xml b/juneau-petstore-server/pom.xml
index 8ec5361..0d5f382 100644
--- a/juneau-petstore-server/pom.xml
+++ b/juneau-petstore-server/pom.xml
@@ -95,11 +95,7 @@
 		    <artifactId>xml-apis</artifactId>
 		    <version>${xml.apis.version}</version>
 		</dependency>
-        <dependency>
-		 <groupId>org.springframework.boot</groupId>
-		 <artifactId>spring-boot-starter-data-jpa</artifactId>
-		  <version>${springframework.version}</version>
-	    </dependency>
+        
     </dependencies>
 
     <build>