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

Fix modules.txt conflicts #684

Merged
merged 1 commit into from
Nov 7, 2022
Merged

Fix modules.txt conflicts #684

merged 1 commit into from
Nov 7, 2022

Conversation

sfc-gh-ext-simba-lb
Copy link
Contributor

@sfc-gh-ext-simba-lb sfc-gh-ext-simba-lb commented Nov 7, 2022 •
edited
Loading

Description

Caused by PR #661. Vendor\Modules.txt has some unresolved conflicts.

Checklist

  • Code compiles correctly
  • Run make fmt to fix inconsistent formats
  • Run make lint to get lint errors and fix all of them
  • Created tests which fail without the change (if possible)
  • All tests passing
  • Extended the README / documentation, if necessary

sfc-gh-igarish
sfc-gh-igarish approved these changes Nov 7, 2022
View reviewed changes
Copy link
Collaborator

@sfc-gh-igarish sfc-gh-igarish left a comment

Choose a reason for hiding this comment

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

LGTM

@sfc-gh-ext-simba-lb sfc-gh-ext-simba-lb merged commit d998e2a into master Nov 7, 2022
@sfc-gh-ext-simba-lb sfc-gh-ext-simba-lb deleted the fixModulesFile branch November 7, 2022 18:50
@github-actions github-actions bot locked and limited conversation to collaborators Nov 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sfc-gh-igarish sfc-gh-igarish sfc-gh-igarish approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sfc-gh-ext-simba-lb @sfc-gh-igarish