Merge branch 'master' of https://gitlab.cl.uni-heidelberg.de/parcalabescu/ressourcenvorkurs_ss20 (ac1df716) · Commits · parcalabescu / Ressourcenvorkurs_SS20

database.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		<<<<<<< HEAD
		Ufkun;rot;Löwe
		=======
		<<<<<<< HEAD
		Dorian;blau;Hund

		=======
		@@ -34,3 +37,4 @@ Tamaki;rosa;Elefant
		=======
		Aileen;blau;Erdmännchen
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0
		>>>>>>> b6a25734c1a48aa04e337bd047ae2947c110f05d