]> git.mxchange.org Git - pizzaservice-core.git/commit
Opps, wrong merge ...
authorRoland Haeder <roland@mxchange.org>
Wed, 27 Apr 2016 20:49:25 +0000 (22:49 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 27 Apr 2016 20:52:48 +0000 (22:52 +0200)
commit47b2a8ddeda678b1db4cb96dcc1ad21006cc1e44
tree0541c6af3ef49c20c6d53a2de953c5e8959f7438
parentecc61ded0eecb3f7e638ae5e4bedd9c05d802c0f
Opps, wrong merge ...

Signed-off-by: Roland Häder <roland@mxchange.org>
.gitattributes
build.xml
lib/nblibraries.properties
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties
nbproject/project.xml
src/conf/MANIFEST.MF [deleted file]
src/java/log4j2.xml [deleted file]
src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java