summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/sqlalchemy/sql/schema.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index ccab31991..ce4182c54 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.