Skip to content

Conversation

@ed-codegen
Copy link
Contributor

@ed-codegen ed-codegen bot commented Oct 11, 2023

Automated PR

@kopekC kopekC added Codegen and removed Codegen labels Oct 19, 2023
print("Line 4")
print("Line 5")
print("Line 3")
print("Line 5")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lines 8 to 10 seem to duplicate content from lines 6 and 7. This seems to be unintended. Please verify and remove duplicates if unnecessary.


# Middle of the file (this section will be the conflicting area)
def function_middle():
<<<<<<< HEAD
Copy link
Contributor Author

Choose a reason for hiding this comment

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

There seems to be a conflict that is not resolved correctly. Lines 21 to 32 show merge conflict markers and duplicated print statements. These conflict markers <<<<<<< HEAD and >>>>>>> main should be removed and the correct code kept.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants