CP-1062 : Eslint conflict free #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CP-1068 Fixes computmaxer#104: Module interpreted as global module format
…ding CP-1061 Import modules in the order they were specified in config
CP-840 Release karma-jspm 2.0.2
Forces file reread in watch cycle (required for tests in current edit) Additionally common problem with testing on windows fixed Closes computmaxer#114 computmaxer#113
CP-1340 feat(config): nocache support for jspm.loadFiles Closes computmaxer#114 (additionally computmaxer#113)
CP-1076 Release karma-jspm 2.0.3
This is primarily useful for SyntaxErrors, as browsers no longer shutdown when encountering a SyntaxError. Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
CP-1392 Redirected errors during System().import to karma().error.
CP-1446 Update gulp-jasmine dependency - fixes computmaxer#133
Add --save-dev to install instructions
CP-1454 Update README.md, karma-jspm 3.11.2016
CP-1447 Support for JSPM 0.17 Beta
CP-1341 Release karma-jspm 2.1.0
Conflicts: src/adapter.js src/init.js
|
+1 |
1 similar comment
|
+1 |
|
@valotas , please merge this into your branch and we'll swarm on your change and get your change merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CODE REVIEW - MERGE CONFLICT RESOLUTION
I took the liberty of resolving these merge conflicts.
This change will pull in master and resolve the merge conflicts. The merge conflicts seemed to be strictly spacing. Please double check this belief.
Conflicts:
src/adapter.js
src/init.js
Required
@valotas @evanweible-wf @maxwellpeterson-wf @trentgrover-wf @sebastianmalysa-wf
FYI:
@jayudey-wf