diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2020-05-29 14:58:49 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2020-05-29 14:58:49 -0700 |
| commit | cc6d9a4dfb366b9477f1fb4acd2fdfa742864a8e (patch) | |
| tree | 91f365d495c9eac52fee1f85bad5ed846006cf0b /python/pytest.ini | |
| parent | 4def29d4e67f0aaece14527ba3ddf9dc07c626c6 (diff) | |
| parent | 34a64b5d8c470ae2627458d791239cfc4d66d6b3 (diff) | |
| download | fatcat-cc6d9a4dfb366b9477f1fb4acd2fdfa742864a8e.tar.gz fatcat-cc6d9a4dfb366b9477f1fb4acd2fdfa742864a8e.zip | |
Merge remote-tracking branch 'origin/martin-harvest-fail-on-400'
Manually resolved conflicts:
python/fatcat_tools/harvest/doi_registrars.py
Diffstat (limited to 'python/pytest.ini')
0 files changed, 0 insertions, 0 deletions