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

Removed floaty islands from lake #42

Merged
merged 2 commits into from Feb 9, 2017
Merged

Removed floaty islands from lake #42

merged 2 commits into from Feb 9, 2017

Conversation

tc975
Copy link
Collaborator

@tc975 tc975 commented Feb 6, 2017

closes #34
(csproj changes, not sure if ok)

@tc975 tc975 requested a review from Mikeywalsh February 8, 2017 11:10
Mikeywalsh
Mikeywalsh requested changes Feb 8, 2017
View reviewed changes
Copy link
Collaborator

@Mikeywalsh Mikeywalsh left a comment

Choose a reason for hiding this comment

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

Branch has not been updated to latest version of master. Merging now would mess with the build order that I changed.

Apart from that its okay, just merge the branch with master and you're good to go!

@RobinStephenson
Copy link
Owner

@Mikeywalsh the merge with master is done by resolving the conflicts and github wont let you push without resolving them first

@Mikeywalsh
Copy link
Collaborator

Alright, looks good to go then

@Mikeywalsh Mikeywalsh merged commit 257fbf0 into master Feb 9, 2017
@RobinStephenson RobinStephenson deleted the MapFixes branch February 16, 2017 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mikeywalsh Mikeywalsh Mikeywalsh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Lake visual issue
3 participants
@tc975 @RobinStephenson @Mikeywalsh