CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-21 07:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore tiger: tags in mergeTags

Browse Source
This commit is contained in:
Bryan Housel
2015-01-07 11:56:46 -05:00
parent d9f204cf45
commit 0e35a6b35b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_remote_changes.js
+1 -1
View File
@@ -93,7 +93,7 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph) {
fail = false;
function ignoreKey(k) {
return k.indexOf('tiger:') === 0 || _.contains(iD.data.discarded, k);
return _.contains(iD.data.discarded, k);
}
for (var i = 0; i < keys.length; i++) {