From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 16 Aug 2013 14:03:05 +0000 (-0400)
Subject: merge error here, though also hedge between explaining about the expressions here vs.
X-Git-Tag: rel_0_9_0b1~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=869620902a5a9a0cfc8e9021e3aa31178f18152c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge error here, though also hedge between explaining about the expressions here vs.
hoping they read the class-level docstring
---

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index ccab31991e..ce4182c54b 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -2509,19 +2509,12 @@ class Index(ColumnCollectionMixin, SchemaItem):
         :param name:
           The name of the index
 
-<<<<<<< HEAD
         :param \*expressions:
           Column expressions to include in the index.   The expressions
           are normally instances of :class:`.Column`, but may also
           be arbitrary SQL expressions which ultmately refer to a
           :class:`.Column`.
 
-          .. versionadded:: 0.8 :class:`.Index` supports SQL expressions as
-             well as plain columns.
-=======
-        :param \*expressions: Column or SQL expressions.
->>>>>>> master
-
         :param unique:
             Defaults to False: create a unique index.