option to set up default scope #34
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
|
Can you resolve conflicts first, by pulling from master again? Thanks! |
# By Robert Gilliam (6) and Jasper Blues (4) # Via Jasper Blues * 'master' of github.com:jasperblues/Typhoon: Update podspec. Clean up method names. revert to bba8437 Fix broken tests. make schemes shared replace External directory with cocoapods. seperate the static library and tests into different projects. change isEqualTo: to isEqual: to fix iOS build errors add an iOS Tests target. rename existing Tests to OS X Tests. now who put that space there make autocomplete for blocks in TyphoonDefinition factory methods include variable names Conflicts: Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.h
|
Sorry i forgot, here it is |
jasperblues
added a commit
that referenced
this pull request
Jul 24, 2013
option to set up default scope
|
Thank you for merge, but this merge took only last merge with master branch, if you look my changes was not applied, probably because you reverted my first pull request |
|
Can you please send another pull request that: a) Includes all required changes vs the master branch |
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.
option to set up default scope. I am normally using block assembly but i added to support for xml assembly too.
EDIT:
local tests are passed, i hope that is ok now :)