Commit Graph

15 Commits

Author SHA1 Message Date
stockth cbe147f776 woooooorrrrrrkkkkkkiinngggggggggg!!!!!!!!!! version(kann nur nicht Rechnen)-;) 2019-07-24 12:20:06 +02:00
komminshotel 3dd7271f8e Merge remote-tracking branch 'origin/master' 2019-07-24 12:27:31 +02:00
komminshotel 66728b13af jonnehei 2019-07-24 11:21:33 +02:00
Kommindiewhatsappgruppe 65e6eea62c ggg 2019-07-24 10:24:04 +02:00
Kommindiewhatsappgruppe 50f8d199d1 ggg 2019-07-24 09:19:15 +02:00
LockeDerBoss e8165fb63c Merge remote-tracking branch 'origin/master' 2019-07-24 09:38:31 +03:00
Spongebob-Schwammkopf 3305222e93 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2019-07-24 08:14:36 +02:00
LockeDerBoss 96501ead6f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
#	Uebungen/test.txt
2019-07-24 09:09:05 +03:00
dxnso d03c5fd698 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Uebungen/test.txt
2019-07-23 10:04:07 +02:00
dxnso dcff3aeabd Merge branch 'master' of C:\Users\wurstda\PycharmProjects\Projekttage with conflicts. 2019-07-23 10:03:57 +02:00
stockth ce5f6345a3 t 2019-07-23 08:00:34 +02:00
LockeDerBoss a3ed87c5bc hey 2019-07-22 10:29:26 +02:00
TimMcCool 7961d3dc22 edited test.txt 2019-07-22 09:16:05 +02:00
lars 83cada06ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/modules.xml
2019-07-22 08:50:05 +02:00
lars cab97272e0 edited test.txt 2019-07-22 08:49:47 +02:00