From: Bernie Innocenti <bernie@codewiz.org>
Date: Tue, 25 May 2010 18:56:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=commitdiff_plain;h=d3e84a884347cc29f983684d37abd02bcee8fabb;hp=7362589e465cabeadb85bae2fb477f8901bc1390

Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

Conflicts:
	user/bernie
---

diff --git a/beertarium b/beertarium
index 0b65ccf..37c2b8f 100644
--- a/beertarium
+++ b/beertarium
@@ -17,8 +17,22 @@
 || Apr 05   || Cash              ||   -300.000 ||
 || Apr 08   || Cash              ||   -100.000 ||
 || Apr 09   || Check deposit #1  || +9.900.000 ||
-|| Apr 12   || Cash              ||     17.000 ||
-|| Apr 13   || Cash              ||    100.000 ||
-|| Apr 14   || Cash              ||     50.000 ||
-|| Apr 15   || Cash              ||    400.000 ||
-|| Apr 16   || Cash              ||    300.000 ||
+|| Apr 12   || Cash              ||    -17.000 ||
+|| Apr 13   || Cash              ||   -100.000 ||
+|| Apr 14   || Cash              ||    -50.000 ||
+|| Apr 15   || Cash              ||   -400.000 ||
+|| Apr 16   || Cash              ||   -300.000 ||
+|| Apr 21   || Cash              ||   -400.000 ||
+|| May 01   || Cash              ||   -400.000 ||
+|| May 04   || Cash              ||   -200.000 ||
+|| May 04   || Internet          ||   -200.000 ||
+|| May 06   || Cash              ||   -600.000 ||
+|| May 12   || Cash              ||   -500.000 ||
+|| May 20   || Check deposit #2  || +4.735.000 ||
+
+=== bernie vs carlos ===
+
+|| Apr 15   || Beer              ||     15.000 ||
+|| Apr 21   || Food              ||      5.000 ||
+|| Apr 21   || Beer              ||     10.000 ||
+|| Apr 22   || Beer / 2          ||    -19.000 ||