From 6ef264339c0870b7aee543f2c3fefeab7decc03c Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 14:52:12 +0200
Subject: [PATCH] [FIX] Fixed conflicts in kanban.js. Thanks to VME.

bzr revid: vta@openerp.com-20121010125212-oy5m304knbifad52
---
 addons/web_kanban/static/src/js/kanban.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index b786441cfc3..9176666e218 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -672,13 +672,8 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-<<<<<<< TREE
         form.on("on_button_cancel", self, am.dialog.on_close);
         form.on_saved.add_last(function() {
-=======
-        form.on_button_cancel.add_last(am.dialog.on_close);
-        form.on('on_saved', self, function() {
->>>>>>> MERGE-SOURCE
             am.dialog.on_close();
             self.view.do_reload();
         });