diff options
| author | root <root@krebs> | 2011-09-01 16:44:21 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 16:44:21 +0200 |
| commit | 6f2df7825a1896ac00480fcd68345629c72386ea (patch) | |
| tree | 8e9bb6153648744ef31741d35c107aa54933f4c8 /cholerab | |
| parent | a0f23b72769deac88e414b1cfdfdbde5882ba704 (diff) | |
| parent | 57c5c973a40bf718f99c6e0fcd65b416514e2257 (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
streams/stream.db
Diffstat (limited to 'cholerab')
| -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 |