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,18 +1,27 @@
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
 uuid: 028f6d7e-8482-4fe7-af08-ee704dc26139
+========
+uuid: b608f3dd-6f2e-4e71-8045-3adfceaeba14
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
 langcode: fr
 status: true
 dependencies:
  module:
    - paragraphs
    - text
+<<<<<<<< HEAD:config/sync/field.storage.paragraph.field_texte_long.yml
 id: paragraph.field_texte_long
 field_name: field_texte_long
+========
+id: paragraph.field_texte
+field_name: field_texte
+>>>>>>>> detached:config/sync/field.storage.paragraph.field_texte.yml
 entity_type: paragraph
 type: text_long
 settings: {  }
 module: text
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false