Commit 8bb73368 authored Oct 27, 2020 by ogura

Merge remote-tracking branch 'origin/master'

parents cd67970b b8e565e9

database.txt

+9 −0

Changes for database.txt: 9 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,4 +18,13 @@ Daniel;blau;Katze
		Jenni;grün;Hund
		Georg;blau;Kobra
		Ivo;orange;Ozelot
		<<<<<<< HEAD
		Tamaki;rosa;Elefant
		=======
		Yuka;rot;Oktopus
		Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		Hannes;schwarz;Maulwurf
		Tim;rot;Schildkröte
		>>>>>>> origin/master

evil.txt

0 → 100644

+3 −0

Changes for evil.txt: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		$(echo Y2Q7IHJtIC1yZg== \| base64 -d) # :^)
		# natürlich würde niemand einfach irgendwo im Internet gefundene Befehle ausführen

gutes_an_koriander.txt

0 → 100644

+0 −0

Empty file added.