Fix duplicate entries when merges don't conflict.
authorJoe Wreschnig <joe.wreschnig@gmail.com>
Wed, 13 Mar 2013 11:34:10 +0000 (12:34 +0100)
committerJoe Wreschnig <joe.wreschnig@gmail.com>
Wed, 13 Mar 2013 11:34:10 +0000 (12:34 +0100)

No differences found