wip: revert stashed changes

zenodo · Feb 23, 2024 · 2e79e7c · 2e79e7c
1 parent 312386e
commit 2e79e7c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/invenio.cfg b/invenio.cfg
@@ -42,12 +42,8 @@ from invenio_rdm_records.services.components import DefaultRecordsComponents
 from invenio_oauthclient.views.client import auto_redirect_login
 
 from invenio_communities.communities.services import facets as community_facets
-<<<<<<< Updated upstream
 
 from zenodo_rdm.custom_fields import CUSTOM_FIELDS_UI, CUSTOM_FIELDS, CUSTOM_FIELDS_FACETS, NAMESPACES
-=======
-from zenodo_rdm.custom_fields import CUSTOM_FIELDS_UI, CUSTOM_FIELDS, CUSTOM_FIELDS_FACETS, NAMESPACES,COMMUNITY_FIELDS, COMMUNITY_FIELDS_UI
->>>>>>> Stashed changes
 from zenodo_rdm.views import frontpage_view_function
 from zenodo_rdm.permissions import ZenodoCommunityPermissionPolicy, ZenodoRDMRecordPermissionPolicy
 from zenodo_rdm.api import ZenodoRDMRecord, ZenodoRDMDraft

diff --git a/site/zenodo_rdm/custom_fields/__init__.py b/site/zenodo_rdm/custom_fields/__init__.py
@@ -34,13 +34,6 @@
     THESIS_NAMESPACE,
 )
 
-<<<<<<< Updated upstream
-=======
-from .community_fields import (
-    COMMUNITY_FIELDS,
-    COMMUNITY_FIELDS_UI,
-)
->>>>>>> Stashed changes
 from .domain_fields import (
     AUDIOVIS_FIELDS,
     AUDIOVIS_FIELDS_UI,