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

Improve Karma Configuration #267

Merged
merged 1 commit into from
Apr 26, 2017
Merged

Improve Karma Configuration #267

merged 1 commit into from
Apr 26, 2017

Conversation

trepagnier
Copy link
Contributor

This PR resolves MapStory/mapstory#652 and does the following:

  • Removes built files from the bower.json main entry
  • Adds a resolution entry for Angular 1.6.3
  • Updates Angular-mocks to the correct version of Angular
  • Removes docs from the default Gulp task
  • Simplifies the default Gulp task

@davisc davisc merged commit bf649e5 into master Apr 26, 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

Successfully merging this pull request may close these issues.

Fix Story-tools Resolution Conflict
3 participants