From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 5 Jan 2014 23:25:24 +0000 (-0500)
Subject: fix the changelog merge
X-Git-Tag: rel_0_9_1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60c00d7c1ad521bccb4fca1f318da167bf72532e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix the changelog merge
---

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