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

[Backport to 2.3-develop] Changed constructor typo in Javascript class #12976

Merged
merged 1 commit into from
Jan 9, 2018
Merged

[Backport to 2.3-develop] Changed constructor typo in Javascript class #12976

merged 1 commit into from
Jan 9, 2018

Conversation

dverkade
Copy link
Member

@dverkade dverkade commented Jan 3, 2018

Backport of #11933

Original PR:

Changed variable with typo consturctor to constructor

This was already solved in the 2.3 develop branch, but another commit with a typo was also in the given PR. This was not yet present in de 2.3 develop branch, so backported the original PR to the 2.3 develop branch.

@orlangur
Copy link
Contributor

orlangur commented Jan 3, 2018

Reminder: cherry-pick 33c476e also

@dverkade
Copy link
Member Author

dverkade commented Jan 3, 2018

@orlangur That's exactly what I did, cherry pick 33c476e since that commit had changes in it which where not present in the 2.3-develop branch. This resulted in a merge conflict which I have resolved, keeping the changes in the 2.3-develop branch and adding the other typo which was fixed in that commit.

@orlangur orlangur added this to the January 2018 milestone Jan 5, 2018
@orlangur
Copy link
Contributor

orlangur commented Jan 5, 2018

@dverkade, oh, I see, you tried to do a squashed merge of your previous PR and there was a conflict due to #10755. Thanks for porting properly! I was confused by a less amount of changes.

@orlangur orlangur added the typo label Jan 5, 2018
@magento-team magento-team merged commit 556d643 into magento:2.3-develop Jan 9, 2018
magento-team pushed a commit that referenced this pull request Jan 9, 2018
@dverkade dverkade deleted the 2.3-Changed-constructor-typo-in-Javascript-class branch June 22, 2018 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants