remove '<<<<<<< HEAD' code line from perfstore2
Merge branch 'no-redis' of https://github.com/capensis/canopsis into no-redis