search

MayOneUS / pledgeservice

pledge.mayday.us
pledge.mayday.us
Apache License 2.0
11 stars 11 forks source link

fix bulkloader conflict #112

Closed brad closed 10 years ago

brad commented 10 years ago

There was a merge conflict that got pushed to this file. I think this is what was wanted, but @brianboyko @jwhite66 you are more familiar with this, can you review?

coveralls commented 10 years ago

Coverage Status

Coverage remained the same when pulling bcddfcc92e8ced34c8372caa30e7a3aff0924e2d on bulkloader_conflict into 97b556a61ba1d3f83a6cab1041c80fff1e66b05c on master.