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,4 +1,8 @@
+<<<<<<< HEAD
 uuid: 9f65141b-47ab-4234-a733-da47e20ba5b9
+=======
+uuid: eb12d60b-1a44-4c35-8a3a-15b22eee0c3d
+>>>>>>> detached
 langcode: fr
 status: true
 dependencies:
@@ -13,8 +17,13 @@ entity_type: paragraph
 bundle: titre_de_chapitre
 label: 'Titre du chapitre'
 description: ''
+<<<<<<< HEAD
 required: true
 translatable: false
+=======
+required: false
+translatable: true
+>>>>>>> detached
 default_value: {  }
 default_value_callback: ''
 settings: {  }