Initial commit with pom.xml
initiales Commit; pom.xml
Initiales Commit: pom.xml
Initiales Commit; pom.xml
test package
Class Kunde Test
test
test
Added mysql test data(csv) for tables: auftrag, auftragsposition,
rechnung
create-tables, .csv-Dateien
Merge branch 'master' of http://Gliniorz:sM3cdqfb@www.iwi.hs-karlsruhe.de/git/swa17.git

Conflicts:
	shop/src/test/resources/mysql/auftragsposition.csv
auftragsposition.csv new
test
Merge branch 'master' of
http://Tobias.Balonier:7bn6knwD@www.iwi.hs-karlsruhe.de/git/swa17.git

Conflicts:
	shop/pom.xml
	shop/src/main/resources/mysql/create-tables.sql
	shop/src/test/resources/mysql/artikel.csv
	shop/src/test/resources/mysql/auftrag.csv
	shop/src/test/resources/mysql/auftragsposition.csv
	shop/src/test/resources/mysql/hibernate_sequence.csv
	shop/src/test/resources/mysql/kunde.csv
	shop/src/test/resources/mysql/lager.csv
	shop/src/test/resources/mysql/lagerposition.csv
	shop/src/test/resources/mysql/lieferung.csv
	shop/src/test/resources/mysql/rechnung.csv
richtige pom.xml
blubb
Merge branch 'master' of
http://Patrick.Frey:Eistee1013!@www.iwi.hs-karlsruhe.de/git/swa17.git

Conflicts:
	shop/pom.xml
	shop/src/main/resources/mysql/create-tables.sql
	shop/src/main/webapp/WEB-INF/faces-config.xml
	shop/src/test/resources/mysql/artikel.csv
	shop/src/test/resources/mysql/auftrag.csv
	shop/src/test/resources/mysql/auftragsposition.csv
	shop/src/test/resources/mysql/hibernate_sequence.csv
	shop/src/test/resources/mysql/kunde.csv
	shop/src/test/resources/mysql/lager.csv
	shop/src/test/resources/mysql/lagerposition.csv
	shop/src/test/resources/mysql/lieferung.csv
	shop/src/test/resources/mysql/rechnung.csv
richtige pom.xml mit allen leuten
j
reparatur