summaryrefslogtreecommitdiff
path: root/main/test/resources/examples/foreign/conflict
Commit message (Expand)AuthorAgeFilesLines
* WIP migrating over from `ammonite.ops` to `os` module.Li Haoyi2018-11-052-4/+2
* Make builds able to depend on external projects (#291)Olivier Mélois2018-04-182-0/+28