hans wurst (5ae02a59) · Commits · parcalabescu / Ressourcenvorkurs_SS20

Renes.txt

0 → 100644

+1 −0

Changes for Renes.txt: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		"This is Renes text file. His favorite animals are alpakas."

0 → 100644

+1 −0

Changes for bruh.txt: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		bruh

+12 −4

Changes for database.txt: 12 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,16 +22,24 @@ Yuka;rot;Oktopus
		Maya;blau;Katze
		Jakob;blau;Stirnlappenbasilisk
		Jasikka;rot; Giraffe
		<<<<<<< HEAD
		Calvin: Lila; Monkey w.w
		<<<<<<< HEAD
		Dorian;blau;Hund

		=======
		Ufkun;rot;Löwe
		>>>>>>> b28cfa568bd7f7e30aa9857e10e793cd6c45243d
		Dorian;blau;Hund
		Hannes;schwarz;Maulwurf
		Tim;rot;Schildkröte
		Tamaki;rosa;Elefant
		<<<<<<< HEAD
		>>>>>>> df7d4d6626cffd35843888b5f5e3de89e4603dc8
		Rene;blau;Alpaka
		=======
		Tamaki;rosa;Elefant
		Aileen;blau;Erdmännchen
		<<<<<<< HEAD
		>>>>>>> 2bf22e9f653f45a6917387bf7e0c44540f084ec0
		>>>>>>> b6a25734c1a48aa04e337bd047ae2947c110f05d
		>>>>>>> ba1e841d0de75dcadd35ed828f507e5ad44efb08
		=======

		>>>>>>> a799c624fe09637939a2b6e431011e5e5e260207

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.

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