Commit 628e86be authored Oct 27, 2020 by Aileen Reichelt

Merge branch 'master' of https://gitlab.cl.uni-heidelberg.de/parcalabescu/ressourcenvorkurs_ss20

New files were added to origin repository

parents 24097ee8 b6a25734

database.txt

+8 −0

Changes for database.txt: 8 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,7 +22,15 @@ Yuka;rot;Oktopus
		Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		<<<<<<< HEAD
		Dorian;blau;Hund

		=======
		Hannes;schwarz;Maulwurf
		Tim;rot;Schildkröte
		Tamaki;rosa;Elefant
		<<<<<<< HEAD
		>>>>>>> df7d4d6626cffd35843888b5f5e3de89e4603dc8
		=======
		Aileen;blau;Erdmännchen
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0

getmeoutofthis.txt

0 → 100644

+2 −0

Changes for getmeoutofthis.txt: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Sometimes you just don't know where to go or what to do
		In these situations just do yoga