before merging

2023-06-01 11:59:28 +02:00
parent e85111c551 b631c32855
commit 17ff30f664
59 changed files with 2381 additions and 261 deletions
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
 uuid: 7bc5005b-8923-42cb-8b21-7ab2dc91406d
+========
+uuid: feb4dba7-f43c-40ee-875c-e8f662eee38d
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
 langcode: fr
 status: true
 dependencies:
@@ -6,8 +10,13 @@ dependencies:
    - entity_reference_revisions
    - node
    - paragraphs
+<<<<<<<< HEAD:config/sync/field.storage.node.field_texte.yml
 id: node.field_texte
 field_name: field_texte
+========
+id: node.field_chapitre_2
+field_name: field_chapitre_2
+>>>>>>>> detached:config/sync/field.storage.node.field_chapitre_2.yml
 entity_type: node
 type: entity_reference_revisions
 settings: