diff options
| author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
| commit | 71df5a4431bce607550eec4425f4fdfbdbfa2af7 (patch) | |
| tree | f71347068d0a9296c857a5027728130e7ed14ca8 /tests/u1db_tests/test_open.py | |
| parent | 3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (diff) | |
| parent | 2f761fea9e72554806b012c64d00fcae80e1d254 (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'tests/u1db_tests/test_open.py')
| -rw-r--r-- | tests/u1db_tests/test_open.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/u1db_tests/test_open.py b/tests/u1db_tests/test_open.py index 88312402..0ff307e8 100644 --- a/tests/u1db_tests/test_open.py +++ b/tests/u1db_tests/test_open.py @@ -21,7 +21,7 @@ import os from u1db import ( errors, open as u1db_open, - ) +) from leap.soledad.tests import u1db_tests as tests from u1db.backends import sqlite_backend from leap.soledad.tests.u1db_tests.test_backends import TestAlternativeDocument |