Skip to content

Conversation

@hinoguma
Copy link
Contributor

@hinoguma hinoguma commented Oct 24, 2020

@kkdai kkdai linked an issue Oct 25, 2020 that may be closed by this pull request
4 tasks
@kkdai kkdai self-requested a review October 25, 2020 02:30
@kkdai
Copy link
Member

kkdai commented Oct 25, 2020

@hinoguma Would you please help to merge the conflict?

# Conflicts:
#	linebot/client.go
#	linebot/webhook.go
#	linebot/webhook_test.go
@hinoguma
Copy link
Contributor Author

@kkdai
I merged and changed arrangement of BenchmarkParseRequest func in webhook_test.go.
Before merge, BenchmarkParseRequest is after TestGetWebhookInfoWithContext.
BenchmarkParseRequest should be after TestEventMarshaling becuase BenchmarkParseRequest is a test code for receiving webhook.

Copy link
Member

@kkdai kkdai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kkdai kkdai merged commit b4c3a9c into line:master Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Messaging API - October 2020 update

2 participants