]> gitweb.factorcode.org Git - factor.git/commitdiff
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)
1  2 
extra/furnace/furnace.factor

Simple merge