before merging

config/sync/core.entity_view_display.paragraph.tableau.default.yml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 uuid: c230c56b-6e1e-4968-9725-bbf5c4d88183
+=======
+uuid: df6a9695-f33a-4d73-bdcc-70a8dcbdf296
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
@@ -6,18 +10,30 @@ dependencies:
     - field.field.paragraph.tableau.field_tableau
     - paragraphs.paragraphs_type.tableau
   module:
+<<<<<<< HEAD
     - entity_reference_revisions
+=======
+    - tablefield
+>>>>>>> detached
 id: paragraph.tableau.default
 targetEntityType: paragraph
 bundle: tableau
 mode: default
 content:
   field_tableau:
+<<<<<<< HEAD
     type: entity_reference_revisions_entity_view
     label: above
     settings:
       view_mode: default
       link: ''
+=======
+    type: tablefield
+    label: above
+    settings:
+      row_header: true
+      column_header: false
+>>>>>>> detached
     third_party_settings: {  }
     weight: 0
     region: content