Fix merge conflict

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

ChangeLog

@@ -100,6 +100,7 @@ phpMyAdmin - ChangeLog
 - issue #11387 phpseclib < 2.0 produces deprecated messages on PHP 7
 - issue #11404 "Switch to copied table" doesn't work
 - issue #11406 Missing quotes after calling "distinct values"
+- issue #11386 Cannot import database with long data in one column
 
 4.4.13.1 (2015-08-08)
 - issue #11368 SQL error when importing phpMyAdmin dump file

libraries/plugins/import/ImportSql.class.php

@@ -136,7 +136,7 @@ class ImportSql extends ImportPlugin
             if (empty($statement)) {
 
                 // Importing new data.
-                $newData = PMA_importGetNextChunk(200);
+                $newData = PMA_importGetNextChunk();
 
                 // Subtract data we didn't handle yet and stop processing.
                 if ($newData === false) {
@@ -197,4 +197,4 @@ class ImportSql extends ImportPlugin
             );
         }
     }
-}
+}