From bd1d5b69fbe6df0f8faf53e3edb5cd7c44e1577c Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Sun, 8 Sep 2013 17:31:12 +0200
Subject: fix ESC for conflicts dialog

---
 core/js/oc-dialogs.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'core/js')

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 7c4483cefcf..dc293f949c1 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -366,7 +366,6 @@ var OCdialogs = {
 									controller.onCancel(data);
 								}
 								$(dialog_id).ocdialog('close');
-								$(dialog_id).ocdialog('destroy').remove();
 							}
 						},
 						{
@@ -378,7 +377,6 @@ var OCdialogs = {
 									controller.onContinue($(dialog_id + ' .conflict:not(.template)'));
 								}
 								$(dialog_id).ocdialog('close');
-								$(dialog_id).ocdialog('destroy').remove();
 							}
 						}];
 
-- 
cgit v1.2.3