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

Follow up to #150: Added support for JSON feed #154

Merged
merged 16 commits into from
Sep 6, 2020
Merged

Follow up to #150: Added support for JSON feed #154

merged 16 commits into from
Sep 6, 2020

Conversation

nkanaev
Copy link
Contributor

@nkanaev nkanaev commented Sep 3, 2020

No description provided.

@mmcdole
Copy link
Owner

mmcdole commented Sep 4, 2020

@nkanaev thanks for the PR! Could you resolve the conflicts? I'll start to review it now.

@coveralls
Copy link

Coverage Status

Coverage increased (+3.01%) to 64.695% when pulling dd5cd61 on nkanaev:json-feed into 193d002 on mmcdole:master.

@nkanaev
Copy link
Contributor Author

nkanaev commented Sep 4, 2020

conflict resolved by:

$ git merge -s recursive -X theirs upstream/master  # upstream points to this repo
$ go test  # updates go.mod & go.sum

@mmcdole mmcdole merged commit a9ae673 into mmcdole:master Sep 6, 2020
@donatj donatj mentioned this pull request Sep 11, 2020
@makew0rld makew0rld mentioned this pull request Nov 17, 2020
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.

4 participants