Fix rebase

netneurolab · May 22, 2024 · b8373b1 · b8373b1
1 parent 4167e61
commit b8373b1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/neuromaps/datasets/__init__.py b/neuromaps/datasets/__init__.py
@@ -12,10 +12,6 @@
                       fetch_fsaverage, fetch_fslr, fetch_mni152,
                       fetch_regfusion, get_atlas_dir, DENSITIES, ALIAS)
 from .annotations import (available_annotations, available_tags,  # noqa
-<<<<<<< HEAD
-                          fetch_annotation)
-=======
                           fetch_annotation,  get_annotations_summary, 
                           get_annotations_desc, get_annotations_report)
 from .contributions import (upload_annotation)
->>>>>>> [ENH] Continue working on the changes