Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Julie Lenaerts 2022-02-28 17:14:37 +01:00
commit a59994355b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
View File

@ -362,7 +362,10 @@
data-bs-parent="#nonCurrent"> data-bs-parent="#nonCurrent">
{% if member.getBudgetResources|length > 0 or member.getBudgetCharges|length > 0 %} {% if member.getBudgetResources|length > 0 or member.getBudgetCharges|length > 0 %}
<<<<<<< HEAD
=======
>>>>>>> 26373e5d238031e1af840ab2e9b4034a2227df0a
<div class="flex-table"> <div class="flex-table">
<h3 class="family-title">{{ 'Actual resources for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3> <h3 class="family-title">{{ 'Actual resources for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
{% if member.getBudgetResources|length > 0 %} {% if member.getBudgetResources|length > 0 %}