Commit b2a32ba5 authored Oct 27, 2020 by kolber

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

Merge fix

parents d341877f ac1df716

database.txt

+4 −0

Changes for database.txt: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		<<<<<<< HEAD
		Ufkun;rot;Löwe
		=======
		<<<<<<< HEAD
		Dorian;blau;Hund

		=======
		@@ -34,3 +37,4 @@ Tamaki;rosa;Elefant
		=======
		Aileen;blau;Erdmännchen
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0
		>>>>>>> b6a25734c1a48aa04e337bd047ae2947c110f05d

flachwitze.txt

0 → 100644

+7 −0

Changes for flachwitze.txt: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Was sagt ein Origami-Lehrer zu seinem Schüler? - Kannste knicken.

		Was ist weiß und guckt durchs Schlüsselloch? - Ein Spannbettlaken.

		Brennholzverleih.

		Wieso können Seeräuber keinen Kreis fahren? - Weil sie Pi raten.

getmeoutofthis.txt

0 → 100644

+2 −0

Changes for getmeoutofthis.txt: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Sometimes you just don't know where to go or what to do
		In these situations just do yoga