]> gitweb.factorcode.org Git - factor.git/commitdiff
help.cookbook: fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 24 Apr 2009 21:45:18 +0000 (16:45 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 24 Apr 2009 21:45:18 +0000 (16:45 -0500)

Trivial merge