Merge pull request #2033 from sipa/kickconflicts

Bugfix: remove conflicting transactions from memory pool

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
Simple merge