ConflictSet: == operator
BlockManager: Remove unused variable
Block: fix instantiation order
BlockManager: avoid comparing different int types
coresolvertest: no SliceStoreResult
ConflictSet: hash_value
Merge branch 'catmaid' of https://github.com/larrylindsey/sopnet
updated modules/catmaidsopnet