summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/README.md b/README.md
index fa0dfde..455b8eb 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,6 @@ Once the file is included, it will create `mysql_*` function if they don't alrea
## Caveats
- Calls to `is_resource()` and `get_resource_type()` on MySQL connections and results will fail as these are now their `mysqli` equivalents.
-<<<<<<< HEAD
- Some errors are now from `ext/mysqli`, and others are `E_USER_WARNING` instead of `E_WARNING`.
- You must use the `mysqli.*` INI entries instead of `mysql.*` (e.g. `mysqli.default_user` instead of `mysql.default_user`)
- Column lengths reported by `mysql_field_len()` assume `latin1`