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.

Sign up for GitHub

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

Jump to bottom

Fix a trivial MERGE error #1330

Closed
wants to merge 1 commit into from
Closed

Fix a trivial MERGE error #1330

wants to merge 1 commit into from

Conversation

manticore-projects
Copy link
Contributor

Fix a trivial MERGE error from Commit 4797a8d

Something went wrong with the Grammar line 4976:

[ <K_AS> select = SelectWithWithItems( ) { createTable.setSelect(select, false); }]

@manticore-projects
Copy link
Contributor Author

Well, you were faster. Kudos!

@wumpz
Copy link
Member

wumpz commented Sep 7, 2021

I was the source ... :/. Now I fell into the merge pain of git or github. Tried to correct some conflicts in some of your PRs and messed up. However again git helped to correct it :).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@manticore-projects @wumpz