summaryrefslogtreecommitdiff
path: root/test/orm/test_options.py
diff options
context:
space:
mode:
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
"""