From 15bc08795d5a0daaeaddd804cdc6729e1dfff848 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 25 Feb 2015 23:35:06 -0500
Subject: [PATCH] Don't save history to localstorage in save mode

(to avoid saving remote merges / conflict resolutions)
---
 js/id/id.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/id/id.js b/js/id/id.js
index 1310999a7..5d47615a3 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -141,7 +141,7 @@ window.iD = function () {
     };
 
     context.save = function() {
-        if (inIntro) return;
+        if (inIntro || (mode && mode.id === 'save')) return;
         history.save();
         if (history.hasChanges()) return t('save.unsaved_changes');
     };