From ddf0dffdaa6c875e4c1bd70d553feda6443b2a4e Mon Sep 17 00:00:00 2001
From: tv <tv@also>
Date: Sat, 6 Aug 2011 00:59:46 +0200
Subject: cholerab README: add conflicts
---
cholerab/README | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/cholerab/README b/cholerab/README
index d6149751..7b53aeaa 100644
--- a/cholerab/README
+++ b/cholerab/README
@@ -61,3 +61,12 @@
- i.e. to start automatically at KREBS
- the last stream should be playbacked
- should be controlable by noise [see NOISE-STREAM-MODULE]
+
+
+## merge conflicts below
+view.py: contains view classes for cholerab
+cholerab.py: main file
+
+start with :
+python cholerab.py
+
--
cgit v1.2.3