]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@factorcode.org>
Mon, 28 Feb 2011 02:01:45 +0000 (20:01 -0600)
committerSlava Pestov <slava@factorcode.org>
Mon, 28 Feb 2011 02:01:45 +0000 (20:01 -0600)
commitebce40a4c004bef587ca30e12a69baaecc296a7d
tree8a7481765b87694fe0c96b8c81f7c218fcdc5a85
parent5a3c5c7749862eff3e9a090f9de8edb6bfb7d5f6
parent640b05d4573fce1c5e1b80ad68febab67151b66d
Fix conflict
basis/bootstrap/ui/ui.factor