From: Roland Haeder <roland@mxchange.org>
Date: Fri, 2 Oct 2015 06:57:42 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8d7ab9407aaa1aa90ee904fc0ffe876730cfa273;p=pizzaservice-core.git

Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	PizzaService-ejb/lib/jcore-logger-lib.jar
	PizzaService-ejb/lib/jcore.jar
	PizzaService-ejb/lib/jshop-core.jar
	PizzaService-ejb/nbproject/build-impl.xml
	PizzaService-ejb/nbproject/genfiles.properties
	PizzaService-ejb/nbproject/project.xml
---

8d7ab9407aaa1aa90ee904fc0ffe876730cfa273