From 416f360a19118c4692e430f0a1f5d12f81876ee7 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 9 Apr 2012 16:32:25 +0300 Subject: Fix changelog merge conflict --- user_guide_src/source/changelog.rst | 4 ---- 1 file changed, 4 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 6b47437d6..8146a5139 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -90,15 +90,11 @@ Release Date: Not Released - num_rows() is now only called explicitly by the developer and no longer re-executes statements. - Added replace() support for SQLite. - Renamed internal method _escape_identifiers() to escape_identifiers(). -<<<<<<< HEAD - - CUBRID driver's utility class now overrides list_databases() in order to use cubrid_list_dbs(). -======= - Added SQLite support for drop_table() in :doc:`Database Forge `. - Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `. - Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `. - Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `. - Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned). ->>>>>>> 918be7963f6fa3461d612ea7ca4c9774c12f9da5 - Libraries -- cgit v1.2.3-24-g4f1b