Conflicts: basis/functors/functors.factor basis/io/launcher/launcher.factor basis/ui/gadgets/tables/tables.factor |
||
|---|---|---|
| .. | ||
| authors.txt | ||
| functors-tests.factor | ||
| functors.factor | ||
| summary.txt | ||
| tags.txt | ||
Conflicts: basis/functors/functors.factor basis/io/launcher/launcher.factor basis/ui/gadgets/tables/tables.factor |
||
|---|---|---|
| .. | ||
| authors.txt | ||
| functors-tests.factor | ||
| functors.factor | ||
| summary.txt | ||
| tags.txt | ||