Madhura Jayaratne f6b7f98322 Fix merge conflicts ...

Signed-off-by: Marc Delisle <marc@infomarc.info>

2014-12-23 10:43:54 -05:00

..

PMA_ExportCodegen_test.php

Move slow test in HHVM to group medium

2014-03-13 20:52:13 +00:00

PMA_ExportCsv_test.php

Fix coding style

2014-06-03 12:40:21 -04:00

PMA_ExportExcel_test.php

Move slow test in HHVM to group medium

2014-03-13 20:52:13 +00:00

PMA_ExportHtmlword_test.php

Adjust tests for commit 3ec96cb038

2014-10-19 08:22:06 +05:30

PMA_ExportJson_test.php

export with table/column names changes extended for other export formats

2014-06-18 16:09:57 +05:30

PMA_ExportLatex_test.php

RFE#919: Multiple-column foreign key relation.

2014-08-01 19:50:12 +05:30

PMA_ExportMediawiki_test.php

Remove unused locale variables.

2014-11-10 23:26:57 +01:00

PMA_ExportOds_test.php

Move slow test in HHVM to group medium

2014-03-13 20:52:13 +00:00

PMA_ExportOdt_test.php

export with table/column names changes extended for other export formats

2014-06-18 16:09:57 +05:30

PMA_ExportPdf_test.php

export with table/column names changes extended for other export formats

2014-06-18 16:09:57 +05:30

PMA_ExportPhparray_test.php

Move slow test in HHVM to group medium

2014-03-13 20:52:13 +00:00

PMA_ExportSql_test.php

Fix merge conflicts

2014-12-23 10:43:54 -05:00

PMA_ExportTexytext_test.php

Fix coding style

2014-06-03 12:40:21 -04:00

PMA_ExportXml_test.php

Revert "The DisableIS directive is removed"

2014-10-09 18:29:55 +05:30

PMA_ExportYaml_test.php

Move slow test in HHVM to group medium

2014-03-13 20:52:13 +00:00

PMA_TableProperty_test.php

Fix type string for longtext

2014-06-06 15:46:34 +02:00