Merge branch 'master' of https://git.tmp.si/luka/Rhizosphere into 8-channel

3 years ago · c491e0e147
parent 1eda666022 6aab465296
commit c491e0e147
1 changed files with 7 additions and 0 deletions
--- a/rhizosphere.scd
+++ b/rhizosphere.scd
@ -29,8 +29,15 @@ Server.default.waitForBoot {
 	});
 });

+<<<<<<< HEAD
 s.meter;
 s.plotTree;
+=======
+
+
+
+s.meter; s.plotTree;
+>>>>>>> 6aab46529682cae5a6bb3e59e378d8fcf94a3e50