Fix/merge conflicts sprint main #27
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Chore/update git config (#19) * add gitattributes * update gitignore * update yml * Chore/dave 126 adminportal umstellung auf vite (#18) * update dependencies and add vite * fix build Errors Part 1 * fix build errors part 2 * fix error * POM auf 2.0.0 gehoben (#20) --------- Co-authored-by: Der-Alex-K <[email protected]>
# Conflicts: # frontend/components.d.ts # frontend/src/components/map/ZaehlstelleMap.vue
Der-Alex-K
approved these changes
Dec 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
mr conflicts zwischen master und main-ls2 behoben
Reference
Issues #XXX