Commit 43cb5159 authored Apr 15, 2020 by huang

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

parents a0d197b7 ae06f920

database.txt

+5 −0

Changes for database.txt: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,3 +17,8 @@ Selina;hellblau;Elefant
		Blanca;braun;Wolf
		>>>>>>> 5ea05dbedc2fbf082d6039733027c503bab9da09

		<<<<<<< HEAD
		Vanessa; grün; Hund

		=======
		>>>>>>> 25a10745d1586e1408e0d411051406bdc9d5e36e