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

cordova-plugin-acmp/src/ios/InitPlugin.h merge error #2

Open
dongzhl opened this issue Sep 22, 2017 · 1 comment
Open

cordova-plugin-acmp/src/ios/InitPlugin.h merge error #2

dongzhl opened this issue Sep 22, 2017 · 1 comment

Comments

@dongzhl
Copy link

dongzhl commented Sep 22, 2017

没有解决merge冲突
已解决

@wxjeek
Copy link
Contributor

wxjeek commented Sep 22, 2017

这个我今天发现了,已经更改了,不好意思啊

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

No branches or pull requests

2 participants