CenterForOpenScience / waterbutler / 20699614095 / 1

84%

develop: 84%

push

github

Merge branch 'feature/cancel-conflict-uploads' into develop

 * Re-applying commit 0efa10c36.  It
   was temporarily reverted to create a merge branch for a later
   commit. Prior commit msg:

   > Merge branch 'feature/cancel-conflict-uploads' into develop
   >
   >  Closes #473
   >  [ENG-8822]

2955 of 3638 branches covered (81.23%)

Branch coverage included in aggregate %.

7544 of 8824 relevant lines covered (85.49%)

0.85 hits per line