Skip to content

🐛 Fix merge conflict between #23577 and #23559#23584

Merged
rsimha merged 1 commit intoampproject:masterfrom
rsimha:2019-07-29-FixConflict
Jul 29, 2019
Merged

🐛 Fix merge conflict between #23577 and #23559#23584
rsimha merged 1 commit intoampproject:masterfrom
rsimha:2019-07-29-FixConflict

Conversation

@rsimha
Copy link
Copy Markdown
Contributor

@rsimha rsimha commented Jul 29, 2019 •
edited
Loading

Addresses #23577 (review)

See https://travis-ci.org/ampproject/amphtml/jobs/565201762#L383

...Type checking failed:
extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js:986: ERROR - [JSC_TYPE_MISMATCH] actual parameter 1 of iterateCursor$$module$src$dom does not match formal parameter
found   : *
required: IArrayLike<?>
    iterateCursor(tags, tag => {
                  ^^^^

@rsimha rsimha requested review from calebcordry and cvializ July 29, 2019 22:01
@rsimha rsimha self-assigned this Jul 29, 2019
@rsimha rsimha mentioned this pull request Jul 29, 2019
Merged
@rsimha rsimha mentioned this pull request Jul 29, 2019
Merged
@rsimha
Copy link
Copy Markdown
Contributor Author

rsimha commented Jul 29, 2019

Fixed: https://travis-ci.org/ampproject/amphtml/jobs/565206240#L374

@rsimha rsimha merged commit 68f3acc into ampproject:master Jul 29, 2019
@rsimha rsimha deleted the 2019-07-29-FixConflict branch July 29, 2019 22:15
@cvializ
Copy link
Copy Markdown
Contributor

cvializ commented Jul 30, 2019

Wow! Thanks

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

Reviewers

@calebcordry calebcordry calebcordry approved these changes

@cvializ cvializ Awaiting requested review from cvializ

Assignees

@rsimha rsimha

Labels

cla: yes Type: Bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rsimha @cvializ @calebcordry @googlebot