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,3 +1,4 @@
+<<<<<<<< HEAD:config/sync/field.field.paragraph.image.field_image.yml
 uuid: 40433c68-1d72-4a68-9478-41bcbcc44bf6
 langcode: fr
 status: true
@@ -12,6 +13,22 @@ field_name: field_image
 entity_type: paragraph
 bundle: image
 label: image
+========
+uuid: 0a0c567f-be14-4fc0-a7d2-65ab494f5740
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_paragraph_image_
+    - paragraphs.paragraphs_type.image
+  module:
+    - image
+id: paragraph.image.field_paragraph_image_
+field_name: field_paragraph_image_
+entity_type: paragraph
+bundle: image
+label: 'paragraph Image '
+>>>>>>>> detached:config/sync/field.field.paragraph.image.field_paragraph_image_.yml
 description: ''
 required: false
 translatable: false