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,9 +1,21 @@
+<<<<<<< HEAD
+<<<<<<<< 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
+=======
+uuid: 7352aa7f-8aad-42f2-9935-738432d28e72
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
  module:
    - paragraphs
+<<<<<<< HEAD
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_titre_du_chapitre.yml
+=======
+>>>>>>> detached
    - text
 id: paragraph.field_titre_du_chapitre
 field_name: field_titre_du_chapitre
@@ -12,6 +24,18 @@ type: text
 settings:
  max_length: 255
 module: text
+<<<<<<< HEAD
+========
+    - 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