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.

Sign up for GitHub

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

Jump to bottom

world spec rebased #257

Merged
merged 1 commit into from
Feb 24, 2016
Merged

world spec rebased #257

merged 1 commit into from
Feb 24, 2016

Conversation

dmaii
Copy link

@dmaii dmaii commented Feb 23, 2016

rebases #253

@jbenet jbenet added the status/deferred Conscious decision to pause or backlog label Feb 23, 2016
dmaii
dmaii reviewed Feb 23, 2016
View reviewed changes
test/components/world-map.spec.js
expect(el.find('svg').length).to.equal(1)
})

it('should have the correct coordinates', () => {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed typo

@dignifiedquire
Copy link
Member

Thanks. For the future you can use git push -f <remote> <branch> to overwrite a branch so you don't need to make a new PR. Also looks like there are some conflicts with the work I did this morning, could you try and resolve these please?

@dmaii dmaii force-pushed the world-spec-rebased branch from e942923 to 2283945 Compare February 23, 2016 22:37
@dmaii
Copy link
Author

dmaii commented Feb 23, 2016

Thanks for the tip. 👍

@dignifiedquire
Copy link
Member

Thanks for the work :) :octocat:

dignifiedquire added a commit that referenced this pull request Feb 24, 2016
@dignifiedquire
Merge pull request #257 from suisha/world-spec-rebased
308b7ed 
world spec rebased
@dignifiedquire dignifiedquire merged commit 308b7ed into ipfs:redux Feb 24, 2016
@jbenet jbenet removed the status/deferred Conscious decision to pause or backlog label Feb 24, 2016
@dignifiedquire dignifiedquire mentioned this pull request Mar 7, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dmaii @dignifiedquire @jbenet