fix: remove stray merge-conflict marker in assets resources#2
Closed
mxatmx wants to merge 1 commit into
Closed
Conversation
A lone '<<<<<<< HEAD' line was left in the AssetsAndTasksResource POST handler, which broke import of the module (and the whole app). Remove it; the surrounding code was already correct. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Owner
Author
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
A lone
<<<<<<< HEADmarker was committed onmaininzou/app/blueprints/assets/resources.py(in theAssetsAndTasksResourcePOST handler). It has no matching=======/>>>>>>>, and a single stray marker line is aSyntaxErrorthat breaks import of the module — and therefore the whole app fails to start.This removes just that one line; the surrounding code was already correct (it is the intended
body = validation.validate_request_body(NewAssetSchema)branch).Verified:
python -m py_compilepasses and the file is free of conflict markers.