]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@factorcode.org>
Thu, 28 Feb 2008 09:28:26 +0000 (03:28 -0600)
committerSlava Pestov <slava@factorcode.org>
Thu, 28 Feb 2008 09:28:26 +0000 (03:28 -0600)
commit5e3aa52a75454fdb87e5d3e4db8a1ba47450781e
tree8363ef6af1e219af94c36b3e621a6495cea7630c
parenta2aa718cd4ac97a7856cce886adf482cff7c66c1
parente79772fce4794da8ba6b67009f3efc037696c787
Fix conflict
extra/furnace/furnace.factor