Merge branch 'master' of ssh://gitcentre/srv/git/test

diff --git a/bika b/bika
new file mode 100644 (file)
index 0000000..6afffd4
--- /dev/null
+++ b/bika
@@ -0,0 +1 @@
+bika

diff --git a/majom b/majom
index a90fe7bc04bf409e354489669694a8389dd108c8..fc8c481ad72cee251a337eefa0181b2737ff58f3 100644 (file)
--- a/majom
+++ b/majom
@@ -1 +1,3 @@
 majom
+cica
+hangya