Fix merge conflicts

phpmyadmin · Aug 24, 2013 · eae2f1b · eae2f1b
2 parents 220fa37 + dd39ca8
commit eae2f1b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/doc/require.rst b/doc/require.rst
@@ -13,7 +13,7 @@ PHP
 ---
 
 * You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library 
-  (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
+  (SPL) extension, JSON support, and the ``mbstring`` extension.
 
 * To support uploading of ZIP files, you need the PHP ``zip`` extension.
 
@@ -31,6 +31,8 @@ PHP
   with the `libxml <http://www.php.net/libxml>`_
   extension.
 
+* Performance suggestion: install the ``ctype`` extension.
+
 .. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`
 
 Database