summaryrefslogtreecommitdiffstats
path: root/cholerab/coda
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-08-06 01:56:55 +0200
committermakefu <github@syntax-fehler.de>2011-08-06 01:56:55 +0200
commit86b0d10fe8dcd47e2c9f5987e0ab4285f00441a5 (patch)
tree713abf2af21808680c7e1d43bf96fbb8ff5b20cb /cholerab/coda
parent1a3e702fe07968a884462cfae82fb0bfce9123c6 (diff)
parent372a67aef910af66ce65ce79f25e50a5f0cc8807 (diff)
emergency merge
Diffstat (limited to 'cholerab/coda')
-rw-r--r--cholerab/coda4
1 files changed, 4 insertions, 0 deletions
diff --git a/cholerab/coda b/cholerab/coda
new file mode 100644
index 00000000..b6442631
--- /dev/null
+++ b/cholerab/coda
@@ -0,0 +1,4 @@
+ok
+ coda
+ Ostracoda
+ Basaliom
[cgit] Unable to lock slot /tmp/cgit/5b000000.lock: Permission denied (13)