Skip to content

Commit f0b1d9c

Browse files
committed
Merge branch 'fork/marc-vdm/major_search' into major-search
# Conflicts: # activity_browser/bwutils/__init__.py # activity_browser/bwutils/metadata.py # activity_browser/layouts/panes/database_products.py # activity_browser/ui/widgets/__init__.py # activity_browser/ui/widgets/item_model.py # activity_browser/ui/widgets/tree_view.py
2 parents 3072b3c + e342f22 commit f0b1d9c

File tree

6 files changed

+1756
-10
lines changed

6 files changed

+1756
-10
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from .base import SearchEngine
2+
from .metadata_search import MetaDataSearchEngine

0 commit comments

Comments
 (0)