Merge branch 'task/ECCW-712' of github.com:essexcountycouncil/essex-g…

…ov-uk-drupal into task/ECCW-712
essexcountycouncil · Oct 17, 2024 · 1df6f23 · 1df6f23
2 parents 84c2912 + c32342d
commit 1df6f23
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/config/default/block.block.ecc_theme_gov_facetformviewdirectorychanneldisplayembed.yml b/config/default/block.block.ecc_theme_gov_facetformviewdirectorychanneldisplayembed.yml
@@ -7,10 +7,7 @@ dependencies:
   module:
     - block_classes
     - facets_form
-<<<<<<< HEAD
     - node
-=======
->>>>>>> fa4e6b351048c1175b4423a10987736868c08188
   theme:
     - ecc_theme_gov
 id: ecc_theme_gov_facetformviewdirectorychanneldisplayembed
@@ -29,7 +26,6 @@ settings:
       submit: Search
       reset: Reset
   facets: {  }
-<<<<<<< HEAD
 visibility:
   'entity_bundle:node':
     id: 'entity_bundle:node'
@@ -38,6 +34,3 @@ visibility:
       node: '@node.node_route_context:node'
     bundles:
       localgov_directory: localgov_directory
-=======
-visibility: {  }
->>>>>>> fa4e6b351048c1175b4423a10987736868c08188