shannonfromomaha / 02-29-pair-project

0 stars 0 forks source link

Pledge#self.collect_pledges has approx 7 statements #52

Closed jillianw closed 8 years ago

jillianw commented 8 years ago
shannonfromomaha commented 8 years ago

weird merge error in CONFLICT (content): Merge conflict in coverage/.last_run.json

`{ "result": { <<<<<<< HEAD

"covered_percent": 34.65

"covered_percent": 36.05

master } } `