gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-04-26 12:34:47 +02:00
commit 46308e1b30
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/tbl_columns_definition_form.lib.php
View File

@ -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
*/