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.

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

Fix develop-main merge isssues #1124

Merged
merged 4 commits into from
Jun 12, 2023
Merged

Fix develop-main merge isssues #1124

merged 4 commits into from
Jun 12, 2023

Conversation

Kr0nox
Copy link
Member

@Kr0nox Kr0nox commented Jun 6, 2023

This PR fixes the merge issues from develop to main.

@tsaglam Could you have a quick lock at the README? The table you gave me does not have a CLI Argument, state and Parser entry in the text row. Could you just confirm whether this is intentional or whether I should add them again?

tsaglam and others added 3 commits May 16, 2023 14:09
Bumps [webpack](https://github.com/webpack/webpack) from 5.69.1 to 5.82.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.69.1...v5.82.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
# Conflicts:
#	README.md
#	report-viewer/package-lock.json
@Kr0nox Kr0nox requested review from tsaglam and a team June 6, 2023 17:44
README.md Outdated Show resolved Hide resolved
Co-authored-by: Timur Sağlam <[email protected]>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jun 7, 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

@tsaglam tsaglam merged commit 0542d53 into develop Jun 12, 2023
@tsaglam tsaglam deleted the fix/merge-issues branch June 12, 2023 09:26
@tsaglam tsaglam added enhancement Issue/PR that involves features, improvements and other changes minor Minor issue/feature/contribution/change labels Jun 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Issue/PR that involves features, improvements and other changes minor Minor issue/feature/contribution/change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants