resolve merge conflicts

8 years ago · 3f3d64992d
parent a04f179d8b 57017c68fa
commit 3f3d64992d
1 changed files with 1 additions and 3 deletions
--- a/www/common/fsStore.js
+++ b/www/common/fsStore.js
@ -175,9 +175,7 @@ define([

            // copy User_hash into sessionStorage because cross-domain iframes
            // on safari replaces localStorage with sessionStorage or something
-            if (sessionStorage) {
-                sessionStorage.setItem('User_hash', localStorage.getItem('User_hash'));
-            }
+            if (sessionStorage) { sessionStorage.setItem('User_hash', localStorage.getItem('User_hash')); }

            var localToken = tryParsing(localStorage.getItem(tokenKey));
            if (localToken === null) {