From 6991ca270eb7ecd879a06971cc9df0334aab7687 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 13:53:52 +0200
Subject: [PATCH] fix bad merge

---
 templates/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/main.js b/templates/main.js
index b3aebcfb..7e3b2dc1 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -70,7 +70,6 @@ var datelocale =
         };
 
 
-function alert(a) {
 function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
       var handler, div, bg, closebtn, okbtn;
       var close = function() {