diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-26 18:32:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-26 18:32:11 -0400 |
| commit | 52ec7a96752c5aa03749ff945a00371f7a7d22c2 (patch) | |
| tree | 3d33cf0318166d67d4834583db877227257569d8 /Assistant/NetMessager.hs | |
| parent | 029b25dc0d4ac6b035eedfedb44fdfe7bb35a580 (diff) | |
fix merge conflict resolution when both sides have the same key
Still need to git rm the old file so git accepts the merge is resolved.
Diffstat (limited to 'Assistant/NetMessager.hs')
0 files changed, 0 insertions, 0 deletions