Renes favorite animal and color added. (5bac1a27) · Commits · parcalabescu / Ressourcenvorkurs_SS20

database.txt

+4 −8

Changes for database.txt: 4 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,23 +22,19 @@ Yuka;rot;Oktopus
		Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		<<<<<<< HEAD
		Ufkun;rot;Löwe
		=======
		<<<<<<< HEAD
		Dorian;blau;Hund

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

		>>>>>>> a799c624fe09637939a2b6e431011e5e5e260207