tests: Fix merge, modulemanager test was removed
authorKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:20:02 +0000 (16:20 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:20:02 +0000 (16:20 +0100)
commit260141cd70f380adba1104651b13cc1ea4b3c385
tree46975a45312b25207ddb27eb0514d3363580ea47
parent1fd4988df04d0b2735c7ffce8fdd96b75929598e
tests: Fix merge, modulemanager test was removed
tests/test.lua