]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 27 Sep 2009 02:27:38 +0000 (21:27 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 27 Sep 2009 02:27:38 +0000 (21:27 -0500)
commit685c4143c924cd153409eb539e9fa6cfa12eecf1
treeca9451165d4efd0259e3e9b76bbbbcf0056f00b2
parentdce02fcdfb32c44b94bd129acad126da6fcc73eb
Fix conflict
basis/alien/syntax/syntax-docs.factor