fix dialog

zaquino · May 29, 2013 · 60d525a · 60d525a
1 parent d5a744f
commit 60d525a
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/javascript/dialog.js b/javascript/dialog.js
@@ -157,20 +157,11 @@
             buttons.eq(i++).click(function() {
                 // Calling function and close the dialog   
 
-<<<<<<< HEAD
-                //Get button return value
-                var result = obj.action();
-                if (result != false){
-                    $.Dialog.hide();
-                    return false;
-                }
-=======
                 obj.action();
                 if(!params.keepOpened) {
                    $.Dialog.close();
                 }
                 return false;
->>>>>>> 9b40cc7219d06ae3243a298144a9cf73d2b5a9a8
             });
         });
     }