Commit 397c6c3d authored by vu's avatar vu
Browse files

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

parents 1212ebcc e32f61df

database.txt

+2 −0
Changes for database.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ Leon;grün;Borneo-Orang-Utan 
Tai;orange;Katze

Tasha,türkis, Delfin

Sarah;dunkelblau;Pinguin

Mingyang;schwarz;Hund

<<<<<<< HEAD

Selina;hellblau;Elefant

=======

Blanca;braun;Wolf

>>>>>>> 5ea05dbedc2fbf082d6039733027c503bab9da09