fix conflict when merging

2025-08-21 15:13:50 +00:00 · 2021-06-03 15:11:09 +02:00
parent 43fb020272 93a67c9ab9
commit f6d4d32ce4
108 changed files with 2766 additions and 1105 deletions
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -41,3 +41,10 @@ services:
    Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
        tags:
            - { name: twig.extension }
+
+    Chill\MainBundle\Templating\Entity\AddressRender:
+        arguments:
+            - '@Symfony\Component\Templating\EngineInterface'
+        tags:
+            - { name: 'chill.render_entity' }
+            
--- a/src/Bundle/ChillMainBundle/config/services/timeline.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
@@ -4,4 +4,7 @@ services:
        arguments:
            - "@doctrine.orm.entity_manager"
        calls:
-            - [ setContainer, ["@service_container"]]
+            - [ setContainer, ["@service_container"]]
+    # alias:
+    Chill\MainBundle\Timeline\TimelineBuilder: '@chill_main.timeline_builder'
+