Conflicts: extra/html/elements/elements.factor extra/html/html.factor extra/tar/tar.factor extra/webapps/pastebin/pastebin.factor Resolving my stupid use conflict |
||
|---|---|---|
| .. | ||
| elements | ||
| parser | ||
| authors.txt | ||
| html-tests.factor | ||
| html.factor | ||
| stylesheet.css | ||
| summary.txt | ||
| tags.txt | ||