Conflicts: basis/ui/gadgets/tables/tables.factor core/vocabs/parser/parser.factor |
||
---|---|---|
.. | ||
loader | ||
parser | ||
authors.txt | ||
summary.txt | ||
vocabs-docs.factor | ||
vocabs-tests.factor | ||
vocabs.factor |
Conflicts: basis/ui/gadgets/tables/tables.factor core/vocabs/parser/parser.factor |
||
---|---|---|
.. | ||
loader | ||
parser | ||
authors.txt | ||
summary.txt | ||
vocabs-docs.factor | ||
vocabs-tests.factor | ||
vocabs.factor |