Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore changes from #289 #299

Merged
merged 3 commits into from
Dec 10, 2019
Merged

Conversation

esune
Copy link
Member

@esune esune commented Dec 10, 2019

Restore changes lost during conflict resolution between #288 and #289

@nrempel can you please check and confirm everything is there?

@codecov-io
Copy link

Codecov Report

Merging #299 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #299      +/-   ##
==========================================
+ Coverage   87.12%   87.12%   +<.01%     
==========================================
  Files         232      232              
  Lines       10816    10817       +1     
==========================================
+ Hits         9423     9424       +1     
  Misses       1393     1393

@nrempel
Copy link
Contributor

nrempel commented Dec 10, 2019

Looks good

@nrempel nrempel merged commit ddc20b2 into openwallet-foundation:master Dec 10, 2019
@lgtm-com
Copy link

lgtm-com bot commented Dec 10, 2019

This pull request fixes 1 alert when merging e19d173 into 1ea9041 - view on LGTM.com

fixed alerts:

  • 1 for Non-iterable used in for loop

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants