removed conflict

browserid/static/dialog/controllers/dialog_controller.js

@@ -15,14 +15,6 @@ $.Controller("Dialog", {}, {
 
     },
       
-<<<<<<< Updated upstream
-    // this is not working yet
-    "input keyup": function(e){
-      if(e.which == 13) {
-        $('.submit').click();
-        e.preventDefault();
-      }
-=======
     setupEnterKey: function() {
       $("input").keyup(function(e) {
           if(e.which == 13) {
@@ -30,7 +22,6 @@ $.Controller("Dialog", {}, {
             e.preventDefault();
           }
         });
->>>>>>> Stashed changes
     },
       
     "#signin click": function(event) {