1
0
Fork 0

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

8-channel
Luka Prinčič 2020-06-06 10:49:10 +02:00
commit c491e0e147
1 changed files with 7 additions and 0 deletions

View File

@ -29,8 +29,15 @@ Server.default.waitForBoot {
});
});
<<<<<<< HEAD
s.meter;
s.plotTree;
=======
s.meter; s.plotTree;
>>>>>>> 6aab46529682cae5a6bb3e59e378d8fcf94a3e50