From e7aa9ea51ee1798bdb2a36262d87eaf22df6d9d7 Mon Sep 17 00:00:00 2001
From: "michele.maris" <michele.maris@inaf.it>
Date: Sun, 19 Feb 2023 09:45:38 +0100
Subject: [PATCH] u
---
src/yapsut/template_subs.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/yapsut/template_subs.py b/src/yapsut/template_subs.py
index 020ffc6..ad2323b 100644
--- a/src/yapsut/template_subs.py
+++ b/src/yapsut/template_subs.py
@@ -110,11 +110,7 @@ class templateFiller:
if not self.isfilled() :
raise Exception('Error, not all the keywords are filled')
#
-<<<<<<< HEAD
- tout=self._t
-=======
tout=self.template
->>>>>>> 290e1038d5d1ec3c06881a87ca11cdeac5ef32ae
for ik,k in enumerate(self._k) :
keyName=self._kfill[ik]
tout=tout.replace(keyName,self._d[k])
--
GitLab