Skip to content

Fix bad rebase between #1296 and #1299#1302

Merged
Julow merged 1 commit intoocaml-ppx:masterfrom
craigfe:fix-bad-rebase
Mar 19, 2020
Merged

Fix bad rebase between #1296 and #1299#1302
Julow merged 1 commit intoocaml-ppx:masterfrom
craigfe:fix-bad-rebase

Conversation

@craigfe
Copy link
Copy Markdown
Contributor

@craigfe craigfe commented Mar 19, 2020

The auto-merge during rebase of #1296 against #1299 introduced a test failure.

This re-promoted the tests to fix that error.

@facebook-github-bot
Copy link
Copy Markdown

Hi @craigfe!

Thank you for your pull request and welcome to our community.We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file.

In order for us to review and merge your code, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks!

The auto-merge during rebase of ocaml-ppx#1296 against ocaml-ppx#1299 introduced a test failure.

This re-promotes the tests to fix that error.
Copy link
Copy Markdown
Collaborator

@Julow Julow left a comment

Choose a reason for hiding this comment

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

Good catch !

@Julow Julow added the no changelog set this to bypass the CI check for changelog entries label Mar 19, 2020
@Julow Julow merged commit 3d4c738 into ocaml-ppx:master Mar 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no changelog set this to bypass the CI check for changelog entries

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants