Skip to content

Fix ConfigService Merge Conflict #8932

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
Merged
merged 1 commit into from
Apr 26, 2024
Merged

Fix ConfigService Merge Conflict #8932

merged 1 commit into from
Apr 26, 2024

Conversation

justindbaur
Copy link
Member

@justindbaur justindbaur commented Apr 26, 2024 •
edited
Loading

Type of change

- [x] Bug fix
- [ ] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

There was a merge problem between #8839 & #8612 where the default value parameter to getFeatureFlag was removed. But the PR was written while it was still there.

Before you submit

  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team
  • Ensure that all UI additions follow WCAG AA requirements

@justindbaur justindbaur requested a review from a team as a code owner April 26, 2024 13:35
@github-actions github-actions bot added the needs-qa Marks a PR as requiring QA approval label Apr 26, 2024
@justindbaur justindbaur merged commit acea273 into main Apr 26, 2024
17 of 18 checks passed
@justindbaur justindbaur deleted the fix-config-service-merge-conflict branch April 26, 2024 13:39
@github-actions GitHub Actions
Copy link
Contributor

Logo
Checkmarx One – Scan Summary & Details – 92d10a8d-2068-4b08-bb34-4af232cf9b9e

No New Or Fixed Issues Found

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cyprain-okeke cyprain-okeke cyprain-okeke approved these changes

@amorask-bitwarden amorask-bitwarden amorask-bitwarden approved these changes

Assignees
No one assigned
Labels
needs-qa Marks a PR as requiring QA approval
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@justindbaur @cyprain-okeke @amorask-bitwarden