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,17 @@
+<<<<<<< HEAD
 uuid: aa1fbe68-8635-4380-b469-5e83437b7278
+=======
+uuid: 7d864fb0-66ab-4d88-8309-9f930192b232
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
  config:
+<<<<<<< HEAD
    - field.field.paragraph.texte.field_texte_long
+=======
+    - field.field.paragraph.texte.field_texte
+>>>>>>> detached
    - paragraphs.paragraphs_type.texte
  module:
    - text
@@ -12,7 +20,11 @@ targetEntityType: paragraph
 bundle: texte
 mode: default
 content:
+<<<<<<< HEAD
  field_texte_long:
+=======
+  field_texte:
+>>>>>>> detached
    type: text_default
    label: above
    settings: {  }