fix bad merge
This commit is contained in:
parent
129eb154b3
commit
6991ca270e
|
@ -70,7 +70,6 @@ var datelocale =
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
function alert(a) {
|
|
||||||
function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
|
function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
|
||||||
var handler, div, bg, closebtn, okbtn;
|
var handler, div, bg, closebtn, okbtn;
|
||||||
var close = function() {
|
var close = function() {
|
||||||
|
|
Loading…
Reference in New Issue