Commit 994404b5067f9cc35dfae2c460e209f30467c3b5

Edward Thomson 2014-07-17T01:25:31

Don't allow conflicts by default