Fix conflict

diff --cc extra/http/server/templating/templating.factor
index f8022c0a584a8c2ea698f710179a46e9e445ce01,277f07a256d72279db24f840f0e95b1193c92ac6..64ee4bd129a289a98be77ae0a5b2c3024e7eaed3
--- 1/extra/http/server/templating/templating.factor
--- 2/extra/http/server/templating/templating.factor
+++ b/extra/http/server/templating/templating.factor
@@@ -77,10 -80,7 +80,10 @@@ DEFER: <% delimite
              parser-notes off
              templating-vocab use+
              dup source-file file set ! so that reload works properly
 -            [ <file-reader> contents [ eval-template ] [ html-error. ] recover ] keep
 +            [
 +                ?resource-path <file-reader> contents
-                 eval-template
++                [ eval-template ] [ html-error. drop ] recover
 +            ] keep
          ] with-scope
      ] assert-depth drop ;