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: merge conflicts #9286

Merged
merged 1 commit into from
Nov 10, 2023
Merged

fix: merge conflicts #9286

merged 1 commit into from
Nov 10, 2023

Conversation

teolemon
Copy link
Member

What

  • fix: merge conflicts

@teolemon teolemon requested a review from a team as a code owner November 10, 2023 14:41
@github-actions github-actions bot added the GitHub Actions Pull requests that update Github_actions code label Nov 10, 2023
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Nov 10, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@codecov-commenter
Copy link

Codecov Report

Merging #9286 (282bc17) into main (2cfce07) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #9286   +/-   ##
=======================================
  Coverage   47.95%   47.95%           
=======================================
  Files          65       65           
  Lines       20277    20277           
  Branches     4914     4914           
=======================================
  Hits         9724     9724           
  Misses       9301     9301           
  Partials     1252     1252

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

@teolemon teolemon merged commit 9c4b9af into main Nov 10, 2023
14 checks passed
@teolemon teolemon deleted the merge-conflicts branch November 10, 2023 17:48
@openfoodfacts-bot openfoodfacts-bot mentioned this pull request Nov 10, 2023
Merged
alexgarel pushed a commit that referenced this pull request Nov 21, 2023
@teolemon @alexgarel
fix: merge conflicts (#9286)
40323d0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexgarel alexgarel alexgarel approved these changes

Assignees

@teolemon teolemon

Labels
GitHub Actions Pull requests that update Github_actions code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@teolemon @codecov-commenter @alexgarel