diff options
| author | EUcancER <root@euer.krebsco.de> | 2011-09-01 12:41:53 +0200 |
|---|---|---|
| committer | EUcancER <root@euer.krebsco.de> | 2011-09-01 12:41:53 +0200 |
| commit | 57c5c973a40bf718f99c6e0fcd65b416514e2257 (patch) | |
| tree | 8e9bb6153648744ef31741d35c107aa54933f4c8 /cholerab/shirts/bestellliste | |
| parent | 37491fdc8cdb5349ab0377d3e528231d0cffe07a (diff) | |
| parent | 63df68949c64bf652c287bda51f7175c64776ad9 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
i hope everything is fine now
Conflicts:
.gitmodules
Diffstat (limited to 'cholerab/shirts/bestellliste')
| -rw-r--r-- | cholerab/shirts/bestellliste | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste index f1f423e1..2c94ffe9 100644 --- a/cholerab/shirts/bestellliste +++ b/cholerab/shirts/bestellliste @@ -16,8 +16,8 @@ Jan 1 2 jj /* bezahlt an makefu */ Zitrone waere leckerer gewesen Ronny 1 M jj /* bezahlt an pfleidi */ Marc 1 L -- Lotho 1 X -- -Sascha 1 X -- -Moritz 1 M -- +Sascha 1 X -j +Moritz 1 M -j RIPE 1 X -- kh 1 L jj gute Verarbeitung, guter Gesamteindruck, passt wie angegossen miefda 1 L jj |