Skip to content

Merge failure between #64 and #65 - #70

Merged
tobywf merged 1 commit into
aws-cloudformation:masterfrom
tobywf:merge-fail
Dec 3, 2019
Merged

tobywf merged 1 commit into
aws-cloudformation:masterfrom
tobywf:merge-fail

Conversation

@tobywf

@tobywf tobywf commented Dec 3, 2019

Copy link
Copy Markdown
Contributor

Issue #, if available: N/A

Description of changes: Both PRs built by themselves... still better than having to manually rebase 😛

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@tobywf tobywf added the bug Something isn't working label Dec 3, 2019
@tobywf tobywf self-assigned this Dec 3, 2019
@tobywf
tobywf merged commit 52ea532 into aws-cloudformation:master Dec 3, 2019
@tobywf
tobywf deleted the merge-fail branch December 3, 2019 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants