@jfbratt: This pull request has a merge conflict after merging in the 15th Congress (#117). Could you please check the merge conflict? If you add additional commits to this branch and push them, they will be added to this pull request. Let me know if you need help resolving the conflict.
lmullen
commented
6 years ago
@jfbratt: This pull request has a merge conflict after merging in the 15th Congress (#117). Could you please check the merge conflict? If you add additional commits to this branch and push them, they will be added to this pull request. Let me know if you need help resolving the conflict.