From 68a4cee50fac7c9e516c81853b0bbb8ecd713747 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 26 Apr 2014 06:31:54 -0400 Subject: [PATCH] Fix merge conflict Signed-off-by: Marc Delisle --- libraries/tbl_columns_definition_form.lib.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 3810be7536..072965edbb 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1291,19 +1291,12 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper, /** * Function to get form parameters for old column * -<<<<<<< HEAD - * @param array $columnMeta column meta - * @param int $length length - * @param array $form_params form parameters - * @param int $columnNumber column/field number -======= * @param array $columnMeta column meta * @param int $length length * @param array $form_params form parameters * @param int $columnNumber column/field number * @param string $type type in lowercase without the length * @param array $extracted_columnspec details about the column spec ->>>>>>> db6ec58 * * @return array */