From 635379cf0dce303c5f90f5b51562be8a3c7b48a9 Mon Sep 17 00:00:00 2001
From: alejandromumo <manuel.alejandro.de.oliveira.da.costa@cern.ch>
Date: Fri, 23 Feb 2024 18:29:28 +0100
Subject: [PATCH] wip: revert stashed changes

---
 invenio.cfg | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/invenio.cfg b/invenio.cfg
index 549893b7..04f18851 100644
--- a/invenio.cfg
+++ b/invenio.cfg
@@ -642,13 +642,6 @@ RDM_CUSTOM_FIELDS = CUSTOM_FIELDS
 
 RDM_CUSTOM_FIELDS_UI = CUSTOM_FIELDS_UI  #  UI components
 
-<<<<<<< Updated upstream
-=======
-COMMUNITIES_CUSTOM_FIELDS_UI = COMMUNITY_FIELDS_UI
-
-COMMUNITIES_CUSTOM_FIELDS = COMMUNITY_FIELDS
-
->>>>>>> Stashed changes
 # Invenio-Communities
 # ==============
 COMMUNITIES_GROUPS_ENABLED = False