]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 29 Jun 2009 06:59:53 +0000 (01:59 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 29 Jun 2009 06:59:53 +0000 (01:59 -0500)
commit82bfaca18824473aa969323c3c51b68ad06823c9
treecb830713e14b8ea85b8a1552bf88e47ab8fdc249
parent0f68ee3e9a33d605df7b247dfe3d51aad3d9ff5e
Fix conflict
basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
basis/compiler/cfg/linear-scan/resolve/resolve.factor