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

[FIX] return annotation of getScript in helper core/js #18

Merged
merged 1 commit into from
Jan 14, 2015
Merged

[FIX] return annotation of getScript in helper core/js #18

merged 1 commit into from
Jan 14, 2015

Conversation

sebastianwagner
Copy link
Contributor

No description provided.

LeeSaferite added a commit that referenced this pull request Jan 14, 2015
[FIX] return annotation of getScript in helper core/js
@LeeSaferite LeeSaferite merged commit 7444246 into OpenMage:magento-1.9 Jan 14, 2015
@avra911
Copy link

avra911 commented Jan 15, 2015

sorry, but this change was in an official magento update or patch? i thought this repo is meant to be an exact copy of the Magento

cc @LeeSaferite

Best regards,
R

@sebastianwagner
Copy link
Contributor Author

Indeed! See OpenMage/magento-lts#8.

@avra911
Copy link

avra911 commented Jan 15, 2015

OpenMage/magento-lts it is a fork that accepts fixes, but OpenMage/magento-mirror should be an exact copy of magento, with bugs :)

@avra911
Copy link

avra911 commented Jan 15, 2015

do i miss something? i think is the other way arround :)

@LeeSaferite
Copy link
Contributor

You are 100% correct. The pull request was merged in error and has been reverted.

@LeeSaferite
Copy link
Contributor

If there were a way for me to disable pull requests on this repo I would.

@avra911
Copy link

avra911 commented Jan 15, 2015

thanks you both

best regards,
R

@Flyingmana
Copy link
Contributor

you still could do a force push, to revoke the merge completely from history

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.

4 participants