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.

Sign up for GitHub

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

Jump to bottom

small fix for previous merge conflict #3342

Merged
merged 2 commits into from
Nov 23, 2021
Merged

small fix for previous merge conflict #3342

merged 2 commits into from
Nov 23, 2021

Conversation

czpmango
Copy link
Contributor

@czpmango czpmango commented Nov 23, 2021 •
edited by Aiee
Loading

What type of PR is this?

  • bug
  • feature
  • enhancement

What does this PR do?

Fixes previous merge conflict.

Which issue(s)/PR(s) this PR relates to?

None.

Checklist：

  • Documentation affected （Please add the label if documentation needs to be modified.)
  • Incompatible （If it is incompatible, please describe it and add corresponding label.）
  • Need to cherry-pick （If need to cherry-pick to some branches, please label the destination version(s).)
  • Performance impacted: Consumes more CPU/Memory

@czpmango czpmango added the ready-for-testing PR: ready for the CI test label Nov 23, 2021
@czpmango czpmango requested review from jievince and Aiee and removed request for jievince November 23, 2021 05:49
@yixinglu yixinglu merged commit 46741d1 into vesoft-inc:master Nov 23, 2021
@jamieliu1023 jamieliu1023 mentioned this pull request Nov 27, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yixinglu yixinglu yixinglu approved these changes

@Aiee Aiee Aiee approved these changes

@jievince jievince jievince approved these changes

Assignees
No one assigned
Labels
ready-for-testing PR: ready for the CI test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@czpmango @yixinglu @Aiee @jievince