]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@factorcode.org>
Wed, 10 Oct 2007 21:49:14 +0000 (17:49 -0400)
committerSlava Pestov <slava@factorcode.org>
Wed, 10 Oct 2007 21:49:14 +0000 (17:49 -0400)
commitb832d8dedbb3008e855b00992f79f23f0176ab57
tree427335e150444f8a5285ece60c0f364b997537f9
parent769680503722308cc64e38253ba001b049659880
parent536ee98b8c04ea0c26d682beecab3b820d66d0df
Fix conflict
extra/http/server/templating/templating.factor