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: some conflict errors #3048

Merged
merged 2 commits into from
Nov 1, 2024
Merged

fix: some conflict errors #3048

merged 2 commits into from
Nov 1, 2024

Conversation

dudantas
Copy link
Member

@dudantas dudantas commented Nov 1, 2024 •
edited
Loading

Fixed some issues caused by git conflicts.

@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Nov 1, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@dudantas dudantas merged commit fd2eed2 into main Nov 1, 2024
35 checks passed
@dudantas dudantas deleted the dudantas/fix-some-conflicts-errors branch November 1, 2024 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@murilo09 murilo09 murilo09 approved these changes

@majestyotbr majestyotbr majestyotbr approved these changes

@phacUFPE phacUFPE phacUFPE approved these changes

@Costallat Costallat Costallat 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.
5 participants
@dudantas @Costallat @phacUFPE @majestyotbr @murilo09