From 60c00d7c1ad521bccb4fca1f318da167bf72532e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 5 Jan 2014 18:25:24 -0500 Subject: [PATCH] fix the changelog merge --- doc/build/changelog/changelog_09.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index ea3849934e..4ba3b7129a 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -43,7 +43,7 @@ :ref:`automap_toplevel` .. change:: - :tags: feature, core + :tags: feature, sql Conjunctions like :func:`.and_` and :func:`.or_` can now accept Python generators as a single argument, e.g.:: @@ -54,12 +54,11 @@ element is an instance of ``types.GeneratorType``. .. change:: - :tags: feature, core + :tags: feature, schema The :paramref:`.Table.extend_existing` and :paramref:`.Table.autoload_replace` parameters are now available on the :meth:`.MetaData.reflect` method. ->>>>>>> automap .. change:: :tags: bug, orm, declarative -- 2.47.3