From 0e35a6b35bfce408b4d1943ac2422a9205a5e79a Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 7 Jan 2015 11:56:46 -0500
Subject: [PATCH] Don't ignore `tiger:` tags in mergeTags

---
 js/id/actions/merge_remote_changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/id/actions/merge_remote_changes.js b/js/id/actions/merge_remote_changes.js
index 71341a643..c81a69ad6 100644
--- a/js/id/actions/merge_remote_changes.js
+++ b/js/id/actions/merge_remote_changes.js
@@ -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++) {