summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@also>2011-08-06 00:59:46 +0200
committertv <tv@also>2011-08-06 00:59:46 +0200
commitddf0dffdaa6c875e4c1bd70d553feda6443b2a4e (patch)
tree1bcdb401f860862c1fad347a847d2df8e32b75b3
parent73d43e510d1a6c4b96f2ce19042fe16f93c342d4 (diff)
cholerab README: add conflicts
-rw-r--r--cholerab/README9
1 files changed, 9 insertions, 0 deletions
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
+