dxnso d03c5fd698 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	Uebungen/test.txt

2019-07-23 10:04:07 +02: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

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

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

vcs.xml

edited test.txt

2019-07-22 09:16:05 +02:00