Commit 9aa0ded2 authored Oct 26, 2020 by Jakob Moser

Remove old data from merge conflict from database.txt

parent c8df610c

database.txt

+0 −11

Changes for database.txt: 0 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,19 +7,8 @@ Tai;orange;Katze
		Tasha,türkis, Delfin
		Sarah;dunkelblau;Pinguin
		Dorothea;rot;Kuh
		<<<<<<< HEAD
		Jin;gelb;Pinguin
		=======
		Mingyang;schwarz;Hund
		>>>>>>> 25a10745d1586e1408e0d411051406bdc9d5e36e
		<<<<<<< HEAD
		Selina;hellblau;Elefant
		=======
		Blanca;braun;Wolf
		>>>>>>> 5ea05dbedc2fbf082d6039733027c503bab9da09

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

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