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,18 @@
+<<<<<<< HEAD
 uuid: 9b71bce9-4a8c-4c42-9309-e0e93fa013d4
 langcode: fr
 status: true
 dependencies:
  config:
    - field.field.paragraph.image.field_image
+=======
+uuid: 02f9559f-bbab-437d-b69c-28a2c8155967
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image.field_paragraph_image_
+>>>>>>> detached
    - paragraphs.paragraphs_type.image
  module:
    - image
@@ -12,7 +21,11 @@ targetEntityType: paragraph
 bundle: image
 mode: default
 content:
+<<<<<<< HEAD
  field_image:
+=======
+  field_paragraph_image_:
+>>>>>>> detached
    type: image
    label: above
    settings: