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,14 +1,27 @@
+<<<<<<<< HEAD:config/sync/core.base_field_override.node.book.title.yml
 uuid: f0030e7d-aa55-4c47-81a3-83c8aef278c4
+========
+uuid: 197ac720-b1db-4a9c-85ae-9be04f706992
+>>>>>>>> detached:config/sync/core.base_field_override.node.static.title.yml
 langcode: fr
 status: true
 dependencies:
  config:
+<<<<<<<< HEAD:config/sync/core.base_field_override.node.book.title.yml
    - node.type.book
 id: node.book.title
 field_name: title
 entity_type: node
 bundle: book
 label: 'Titre de la partie'
+========
+    - node.type.static
+id: node.static.title
+field_name: title
+entity_type: node
+bundle: static
+label: Titre
+>>>>>>>> detached:config/sync/core.base_field_override.node.static.title.yml
 description: ''
 required: true
 translatable: true