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)
commit47a530c22a3f277d11e7ddb4b0147c8f93f6f9cd
tree5d660ad6030621cee0012b023ca51987845ac128
parent402a1b679ced5422e46c7a5caeecc45e5ed878db
Fix duplicate entries when merges don't conflict.
Classes/NJMappingsController.m
Info.plist