diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 16:37:38 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 16:37:38 (GMT) |
| commit | 9bd1bff4d8ab6247e5793c0b78b9bf2581773341 (patch) | |
| tree | 13a4914f0de789d3c6dd9acf70a273f6d34c9230 /src/olpc/datastore/__init__.py | |
| parent | e29723a33192cb27b1de83fd8e1abd110bbc1433 (diff) | |
| parent | b1c4a254adc0573221c0d6661459248fd3c507ef (diff) | |
Merge branch 'master' of ../datastore2
Conflicts:
src/olpc/datastore/backingstore.py
src/olpc/datastore/datastore.py
src/olpc/datastore/xapianindex.py
tests/test_sugar.py
Diffstat (limited to 'src/olpc/datastore/__init__.py')
| -rw-r--r-- | src/olpc/datastore/__init__.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/olpc/datastore/__init__.py b/src/olpc/datastore/__init__.py index fd38d75..8b13789 100644 --- a/src/olpc/datastore/__init__.py +++ b/src/olpc/datastore/__init__.py @@ -1,5 +1 @@ -# datastore package -from olpc.datastore.datastore import DataStore, DS_LOG_CHANNEL - - |