added (fd5990a3) · Commits · parcalabescu / Ressourcenvorkurs_SS20

database.txt

+1 −4

Changes for database.txt: 1 added line, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,13 +18,10 @@ Daniel;blau;Katze
		Jenni;grün;Hund
		Georg;blau;Kobra
		Ivo;orange;Ozelot
		<<<<<<< HEAD
		Tamaki;rosa;Elefant
		=======
		Yuka;rot;Oktopus
		Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		Hannes;schwarz;Maulwurf
		Tim;rot;Schildkröte
		>>>>>>> origin/master
		Tamaki;rosa;Elefant