Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
phpmyadmin · Apr 26, 2014 · 68a4cee · 68a4cee
1 parent 2c45563
commit 68a4cee
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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
  */