fixing conflit

Leandro Santos
2 parents 3e5d0243 cad89d00
Showing 1 changed file with 4 additions and 6 deletions Show diff stats
js/main.js
@@ -319,10 +319,10 @@ define([&#39;handlebars&#39;], function(Handlebars){
       loginButton.siblings('.login-container').show();
     }
   }
-  
-  // function oauthPluginHandleLoginResult(loggedIn, token) {
-  //   loginCallback(loggedIn, token);
-  // }
+
+  function oauthPluginHandleLoginResult(loggedIn, token) {
+    loginCallback(loggedIn, token);
+  }
   function guid() {
     function s4() {
@@ -330,8 +330,6 @@ define([&#39;handlebars&#39;], function(Handlebars){
         .toString(16)
         .substring(1);
     }
-    return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
-      s4() + '-' + s4() + s4() + s4();
   }
   function display_category_tab(){