]> gitweb.factorcode.org Git - factor.git/commit
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)
commit28b6d07d75c1ac0342e5f334c284c36eef0c59b2
tree56d4889cd9c91e12716ad4dd911508a792f9ad01
parentb1c790da416e845786bbc7203dcc3034f36d4693
parent7095ace2c1044615fed09422e8c540ec8a8328b0
help.cookbook: fix conflict