before merging

2023-06-01 11:59:28 +02:00
parent e85111c551 b631c32855
commit 17ff30f664
59 changed files with 2381 additions and 261 deletions
@@ -5,7 +5,11 @@ dependencies:
  config:
    - core.entity_view_mode.node.teaser
    - field.field.node.book.body
+<<<<<<< HEAD
    - field.field.node.book.field_texte
+=======
+    - field.field.node.book.field_chapitre_2
+>>>>>>> detached
    - node.type.book
  module:
    - text
@@ -29,6 +33,10 @@ content:
    weight: 101
    region: content
 hidden:
+<<<<<<< HEAD
  field_texte: true
+=======
+  field_chapitre_2: true
+>>>>>>> detached
  langcode: true
  search_api_excerpt: true