]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 18 Dec 2008 23:10:01 +0000 (17:10 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 18 Dec 2008 23:10:01 +0000 (17:10 -0600)
commitb11cbaa3af8c91ecff1c24a4a2b247da73a9476f
treeb1a648f5c1c4cd185fb1ab50fcb064d4fc61b164
parentcfca27ba5fad7f19ca1f2b4c3965385f4ee56f89
parent670cbbfc9f309e66ecc2a4dc31a2c47813666d3c
Fix conflict
extra/fuel/fuel.factor