fix bad merge line error
Merge branch 'no-redis' of github.com:capensis/canopsis into no-redis