]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@factorcode.org>
Mon, 28 Jan 2008 05:23:12 +0000 (23:23 -0600)
committerSlava Pestov <slava@factorcode.org>
Mon, 28 Jan 2008 05:23:12 +0000 (23:23 -0600)
commitdccab9116f33476b67cff7b085293740ca32d51e
treeb252fcd03dd3d6b2e48a420351fd55af35079ee9
parent578ee725098d88f1c981f9acffa0299a99f012be
parent33193a92f88a90eea65b6c50fc39b1f679724832
Fix conflict
core/alien/syntax/syntax-docs.factor
extra/assocs/lib/lib.factor