Closed jillianw closed 8 years ago
weird merge error in CONFLICT (content): Merge conflict in coverage/.last_run.json
`{ "result": { <<<<<<< HEAD
"covered_percent": 36.05
master } } `