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

chore: Restore the parts that were overwritten during conflict resolution. #14141

Merged
merged 1 commit into from
Mar 4, 2025

Conversation

Nov1c444
Copy link
Collaborator

Summary

This line of code in graph.py was mistakenly deleted during conflict resolution when merging the plugin branch. It has now been re-merged.

Original PR: #13673

Checklist

Important

Please review the checklist below before submitting your pull request.

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

@Nov1c444 Nov1c444 requested a review from Yeuoly February 21, 2025 03:12
@dosubot dosubot bot added the size:XS This PR changes 0-9 lines, ignoring generated files. label Feb 21, 2025
@Nov1c444 Nov1c444 requested a review from crazywoola March 4, 2025 02:57
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Mar 4, 2025
@crazywoola crazywoola merged commit 24d8000 into main Mar 4, 2025
10 checks passed
@crazywoola crazywoola deleted the chore/graph-merge-conflict branch March 4, 2025 03:21
jackzhuo pushed a commit to jackzhuo/dify that referenced this pull request Mar 14, 2025
parambharat pushed a commit to parambharat/dify that referenced this pull request Mar 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants