Christopher Ostrouchov dac171dd5d merge: fixing changes with nixpkgs since pull-request ...

- pytest-timeout: no longer requires patch
 - joblib: was improperly merged with the github merge tool (never
   using again)

2018-09-11 14:24:59 -04:00

588 B

Raw Blame History

View Raw