Reslove conflicts
Signed-off-by: Khanh Ngo <khanh.ngo@taxfix.de>
This commit is contained in:
commit
b7197948c1
|
@ -15,7 +15,7 @@
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro serial(domain) %}
|
{% macro serial(domain) %}
|
||||||
{% if domain.serial == 0 %}{{ domain.notified_serial }}{% else %}{{ domain.serial }}{% endif %}
|
{% if domain.serial == '0' %}{{ domain.notified_serial }}{% else %}{{ domain.serial }}{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro master(domain) %}
|
{% macro master(domain) %}
|
||||||
|
|
Loading…
Reference in a new issue