wikitude plugin properly added #1278
wikitude plugin properly added #1278yailPeralta wants to merge 2 commits intoionic-team:dev-nextfrom
Conversation
|
Thanks for your work on this. One issue: Here's the full output: You can use |
|
Jshint issue fixed |
|
Drop the dist/ng-cordova.js change and you'll be fine. Just remember when you build to have the commit ignore changes in the |
142a4ab to
3bc927a
Compare
|
Fixed up! |
|
The only remaining issue is that you shouldn't have any changes in the dist/* folders (reason being, that's an artifact folder and changes there are really hard to merge in; so we make changes there when we release). |
|
@gortok sorry I forgot that part, is ready. |
|
Unfortunately you can't just add the |
|
Ok sure, sorry about that, but how can i do it? |
|
revert the files you changed in dist/ to their previous state (before you messed with them) http://stackoverflow.com/questions/215718/reset-or-revert-a-specific-file-to-a-specific-revision-using-git |
|
Finally achieved, I hope .. |
|
@yailPeralta Your commit still shows the dist change: https://github.com/driftyco/ng-cordova/pull/1278/files Isn't Git fun? |
gortok
left a comment
There was a problem hiding this comment.
Please remove the dist/* files from the commit.
No description provided.