Commit cfb76441 authored Oct 27, 2020 by tapken

trying to solve merg conflicts

parents bc680e55 b28cfa56

Renes.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		"This is Renes text file. His favorite animals are alpakas."

bruh.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		bruh

database.txt

+2 −5

Original line number	Diff line number	Diff line
		@@ -25,11 +25,12 @@ Jasikka;rot; Giraffe
		Ufkun;rot;Löwe
		Dorian;blau;Hund
		<<<<<<< HEAD
		<<<<<<< HEAD
		Lars; alle; Pinguin

		=======
		=======
		>>>>>>> 5bac1a277cb238733b85291daa249dc440eeb713
		=======
		Hannes;schwarz;Maulwurf
		Tim;rot;Schildkröte
		<<<<<<< HEAD
		@@ -38,9 +39,5 @@ Rene;blau;Alpaka
		Tamaki;rosa;Elefant
		Aileen;blau;Erdmännchen
		<<<<<<< HEAD
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0
		>>>>>>> b6a25734c1a48aa04e337bd047ae2947c110f05d
		>>>>>>> ba1e841d0de75dcadd35ed828f507e5ad44efb08
		=======

		>>>>>>> a799c624fe09637939a2b6e431011e5e5e260207