From f173fd504bbfceafc06eaa84f934893527c16f98 Mon Sep 17 00:00:00 2001 From: gaazzopa Date: Wed, 9 Dec 2020 18:37:29 +0100 Subject: [PATCH] Resolved conflicts in calculator.form.html.j2 --- cara/apps/calculator/templates/calculator.form.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index e83a98ae..b87e423a 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -219,7 +219,7 @@ Ventilation data: