]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 17 Feb 2009 03:47:35 +0000 (21:47 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 17 Feb 2009 03:47:35 +0000 (21:47 -0600)
commit73dfa2ae651dc7e5bdd3ed7bfba43422eac88ae3
tree11aae1574b00b03e66d6452c7d6c64ab0b4b0551
parent421ee726b81baf2b009feb8c0d4228fc4cbbee4b
parent6e8c86a093e9c301b3c589cd9e9ab99453edf6a3
Fix conflict
basis/ui/operations/operations.factor
basis/ui/tools/operations/operations.factor