From daf7d84b972b0f4ef2a35fcf9b48101417a7110d Mon Sep 17 00:00:00 2001 From: totoro Date: Mon, 28 Mar 2016 12:36:25 +0200 Subject: [PATCH] fix the faulty merge --- database/vtm/view_table_renderer.anubis | 4 ---- 1 file changed, 0 insertions(+), 4 deletions(-) diff --git a/database/vtm/view_table_renderer.anubis b/database/vtm/view_table_renderer.anubis index 45365b8..4c42cde 100644 --- a/database/vtm/view_table_renderer.anubis +++ b/database/vtm/view_table_renderer.anubis @@ -205,12 +205,8 @@ public define HTML_Partial_Content partial_content( div( [/*class("tableau")*/], sequence( -<<<<<<< HEAD [ partial(jquery_button(jQuery_button(button, "edit_table_"+rows.table_name, "", _T("NEW"), jQuery_actioner(same, jqlink, "edit_table&table_name="+rows.table_name)))), -======= - [ partial(jquery_button(jQuery_button(button, "", _T("NEW"), jQuery_actioner(same, jqlink, "table_name"), jq_icon_none, jq_icon_none)))/*actioner(same,same, link([class("my_button")],_T("NEW")),"edit_table",[("table_name", rows.table_name)])*/, ->>>>>>> 50b6dd00541faf76383aa5ad807b547c3f882842 //dialog used by datatable entries partial(jq_dialog_create(dialog_id(action_name+"_dlg_ajax"), ajax("?a=ajax_edit_table&table_name="+rows.table_name))), -- libgit2 0.21.4