u

src/yapsut/template_subs.py

@@ -110,7 +110,11 @@ 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])