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

"esm module interop flag" reflects knex #3571 #251

Merged
merged 1 commit into from Jan 15, 2020
Merged

"esm module interop flag" reflects knex #3571 #251

merged 1 commit into from Jan 15, 2020

Conversation

D10221
Copy link

@D10221 D10221 commented Jan 14, 2020

Follows knex/knex#3616
Assuming build step is after knex#merge

@@ -80,6 +80,75 @@ export default [
});
`
},
{
Copy link
Collaborator

Choose a reason for hiding this comment

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

Was this part supposed to be included in this PR?..

Copy link
Author

@D10221 D10221 Jan 15, 2020

Choose a reason for hiding this comment

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

No, don't know who it got there :(
I tried to amend my initial commit , maybe its bringing master's merge history back to present like it is my own .
I didn't write that
Sorry,

reset to gh-pages
re-apply changes
@D10221
Copy link
Author

D10221 commented Jan 15, 2020

Did reset the branch to gh-pages
re-applied the changes
and forced update of this branch
If you are not happy I understand :) , I can do it again in a new branch .
Thanks

@kibertoad kibertoad merged commit 54ae31a into knex:gh-pages Jan 15, 2020
@kibertoad
Copy link
Collaborator

Thanks, looks good!

@D10221
Copy link
Author

D10221 commented Jan 15, 2020

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants