Add registering to Space #351
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
ghost
assigned 
anarva
force-pushed
the
space-registering
branch
from
214a8dd
to
345fb4f
Compare
anarva
suggested changes
Feb 2, 2018
There was a problem hiding this comment.
Tried merging this feature branch with master. Space-registering branch has a some conflicting changes with branch feature/remove-sky, which breaks the functionality.
Any suggestions from the author to resolve this?
(Note: This is not about the src/lang/fi.json conflict found by Git.)
|
feature/remove-sky seems to have other issues aswell such as trying to use wrong function names. I should look onto this more and fix the issues. |
|
@anarva I fixed the errors within feature/remove-sky, so you can try merging now. |
anarva
approved these changes
Feb 8, 2018
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.
Add feature to register to space via designer.