commit | f7af1ec6d8f1894682b46568a4a5b08d67c1de0c | [log] [tgz] |
---|---|---|
author | Garrett Cooper <yanegomi@gmail.com> | Sat Dec 18 09:04:37 2010 -0800 |
committer | Garrett Cooper <yanegomi@gmail.com> | Sat Dec 18 09:04:37 2010 -0800 |
tree | 17cd43477d33b2d69287f912d71a64e65da27e99 | |
parent | bb52196b2445f6578879ece50b8d2247ce35830b [diff] |
Get rid of conflict markers and incorrectly merged code. Signed-off-by: Garrett Cooper <yanegomi@gmail.com>