before merging

2023-06-01 11:59:28 +02:00
parent e85111c551 b631c32855
commit 17ff30f664
59 changed files with 2381 additions and 261 deletions
@@ -4,7 +4,11 @@ status: true
 dependencies:
  config:
    - field.field.node.book.body
+<<<<<<< HEAD
    - field.field.node.book.field_texte
+=======
+    - field.field.node.book.field_chapitre_2
+>>>>>>> detached
    - node.type.book
  module:
    - entity_reference_revisions
@@ -24,14 +28,22 @@ content:
    third_party_settings: {  }
    weight: 100
    region: content
+<<<<<<< HEAD
  field_texte:
+=======
+  field_chapitre_2:
+>>>>>>> detached
    type: entity_reference_revisions_entity_view
    label: above
    settings:
      view_mode: default
      link: ''
    third_party_settings: {  }
+<<<<<<< HEAD
    weight: 103
+=======
+    weight: 102
+>>>>>>> detached
    region: content
  links:
    weight: 101