summaryrefslogtreecommitdiff
path: root/test/orm/test_options.py
diff options
context:
space:
mode:
authorGunnlaugur Þór Briem <gunnlaugur@gmail.com>2014-07-31 23:26:18 +0000
committerGunnlaugur Þór Briem <gunnlaugur@gmail.com>2014-08-21 18:38:23 +0000
commita12fcd1487f6ae210486fa4a015d9ea71e3bb7d7 (patch)
tree86d4b75d9cf0261f30243e979f643220ee303126 /test/orm/test_options.py
parent7c4d0a4d6611fd891fb7afda6db277e9fbf83e70 (diff)
downloadsqlalchemy-pr/130.tar.gz
Fix doc typo 'conjunection'pr/130
Diffstat (limited to 'test/orm/test_options.py')
-rw-r--r--test/orm/test_options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/orm/test_options.py b/test/orm/test_options.py
index 6eba38d15..1c1a797a6 100644
--- a/test/orm/test_options.py
+++ b/test/orm/test_options.py
@@ -497,7 +497,7 @@ class OptionsTest(PathTest, QueryTest):
class OptionsNoPropTest(_fixtures.FixtureTest):
"""test the error messages emitted when using property
- options in conjunection with column-only entities, or
+ options in conjunction with column-only entities, or
for not existing options
"""