Kommer ej ihåg

stuff
Merge branch 'master' of https://github.com/elfabiano/TDP024

Conflicts:
	account-data-api/build/built-jar.properties
	account-data-impl-db/build/built-jar.properties
	account-data-impl-db/dist/account-data-impl-db.jar
	account-logic-api/build/built-jar.properties
	account-logic-impl/dist/account-logic-impl.jar

account-rest/build/test/results/TEST-tdp024.account.rest.service.Account
ServiceTest.xml
	account-rest/build/web/WEB-INF/lib/account-data-impl-db.jar
	account-rest/build/web/WEB-INF/lib/account-logic-impl.jar
	account-util/build/built-jar.properties
Accountlogic lagret typ klart

Måste lägga till transactions och tester i detta lager.
gitignrore

g
Merge branch 'master' of https://github.com/elfabiano/TDP024

Conflicts:
	.gitignore
	account-data-api/build/built-jar.properties
	account-data-impl-db/build/built-jar.properties
	account-data-test/build/built-jar.properties

account-data-test/build/test/results/TEST-se.liu.ida.tdp024.account.data
.test.facade.AccountEntityFacadeTest.xml
	account-data-test/derby.log
	account-logic-api/build/built-jar.properties
	account-logic-impl/dist/account-logic-impl.jar
	account-rest/build/web/WEB-INF/lib/account-logic-impl.jar
	account-util/build/built-jar.properties