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

taxonomy: Bulgarian additions #7591

Merged
merged 2 commits into from
Oct 26, 2022
Merged

taxonomy: Bulgarian additions #7591

merged 2 commits into from
Oct 26, 2022

Conversation

Roto15
Copy link
Contributor

@Roto15 Roto15 commented Oct 23, 2022

No description provided.

@github-actions github-actions bot added categories 🥗 Ingredients 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies labels Oct 23, 2022
stephanegigandet
stephanegigandet approved these changes Oct 24, 2022
View reviewed changes
Copy link
Contributor

@stephanegigandet stephanegigandet left a comment

Choose a reason for hiding this comment

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

Thank you!

@github-actions github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Oct 24, 2022
@Roto15
Copy link
Contributor Author

Roto15 commented Oct 25, 2022

What is the conflict here? @stephanegigandet

@stephanegigandet
Copy link
Contributor

@benbenben2 the English entry for vanilla flavour was changed in another PR, so Git got confused. I fixed the conflict.

@sonarqubecloud
Copy link

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

@teolemon teolemon added the 🇧🇬 Bulgaria https://bg.openfoodfacts.org label Oct 26, 2022
@Roto15 Roto15 merged commit 1a25181 into main Oct 26, 2022
@Roto15 Roto15 deleted the BG-Taxonomy branch October 26, 2022 17:13
@alexgarel alexgarel mentioned this pull request Oct 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephanegigandet stephanegigandet stephanegigandet approved these changes

Assignees

@Roto15 Roto15

Labels
🇧🇬 Bulgaria https://bg.openfoodfacts.org categories 🥗 Ingredients 💥 Merge Conflicts 💥 Merge Conflicts 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Roto15 @stephanegigandet @teolemon