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

..

misc.xml

t

2019-07-23 08:00:34 +02:00

modules.xml

Merge branch 'master' of C:\Users\wurstda\PycharmProjects\Projekttage with conflicts.

2019-07-23 10:03:57 +02:00

Projekttage1.iml

t

2019-07-23 08:00:34 +02:00

projekttage.iml

hey

2019-07-22 10:29:26 +02:00

Projekttage.iml

Merge branch 'master' of C:\Users\wurstda\PycharmProjects\Projekttage with conflicts.

2019-07-23 10:03:57 +02:00

vcs.xml

hey

2019-07-22 10:29:26 +02:00