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,8 +1,17 @@
+<<<<<<< HEAD
 uuid: 903ce88d-f47a-447d-ad6e-b2e511baafe1
+=======
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+uuid: 25394f58-6e89-4912-b1de-e2d73ee54b2c
+========
+uuid: e2e5d683-8d2d-4e51-827b-4520ee09464e
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
  module:
+<<<<<<< HEAD
    - entity_reference_revisions
    - node
    - paragraphs
@@ -13,6 +22,27 @@ type: entity_reference_revisions
 settings:
  target_type: node
 module: entity_reference_revisions
+=======
+    - paragraphs
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+    - text
+id: paragraph.field_titre_du_chapitre
+field_name: field_titre_du_chapitre
+entity_type: paragraph
+type: text
+settings:
+  max_length: 255
+module: text
+========
+    - tablefield
+id: paragraph.field_tableau
+field_name: field_tableau
+entity_type: paragraph
+type: tablefield
+settings: {  }
+module: tablefield
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_tableau.yml
+>>>>>>> detached
 locked: false
 cardinality: 1
 translatable: true