rzurtzurtzu
my Commit
Merge branch 'master' of
ssh://git@github.com/Simon290/PCAdministration.git

Conflicts:
	PCAdministration/src/main/java/TestClass.java
Thats my Commit hopfully it works
Thats my Commit hopfully it works
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of
ssh://git@github.com/Simon290/PCAdministration.git

Conflicts:
	PCAdministration/src/main/java/TestClass.java