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 ccab31991edc46d6ec5d717d8767dd6839aafa24..ce4182c54b432e453d47010e5e9545d6b0684800 100644 (file)
--- 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.