summaryrefslogtreecommitdiff
path: root/sapi/fpm/tests/CONFLICTS
Commit message (Expand)AuthorAgeFilesLines
* Disable parallelism for FPM testsNikita Popov2020-02-031-1/+3
* Add CONFLCITS file for fpmNikita Popov2019-05-311-0/+1