Andrin Fassbind 1589652b65 Merge remote-tracking branch 'origin/main' ... # Conflicts: # .idea/gruppe06-hufflepuff-projekt2-texteditor.iml		2021-10-29 08:29:49 +02:00
..
.gitignore	add unversioned Files	2021-10-29 08:26:15 +02:00
gruppe06-hufflepuff-projekt2-texteditor.iml	Merge remote-tracking branch 'origin/main'	2021-10-29 08:29:49 +02:00
misc.xml	add unversioned Files	2021-10-29 08:26:15 +02:00
modules.xml	add unversioned Files	2021-10-29 08:26:15 +02:00
vcs.xml	add unversioned Files	2021-10-29 08:26:15 +02:00