Commit c4c37822 authored Oct 27, 2020 by maigatter

added

parent 3eecbb6f

database.txt

+0 −4

Changes for database.txt: 0 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -37,9 +37,5 @@ Rene;blau;Alpaka
		Tamaki;rosa;Elefant
		Aileen;blau;Erdmännchen
		<<<<<<< HEAD
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0
		>>>>>>> b6a25734c1a48aa04e337bd047ae2947c110f05d
		>>>>>>> ba1e841d0de75dcadd35ed828f507e5ad44efb08
		=======

		>>>>>>> a799c624fe09637939a2b6e431011e5e5e260207