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.

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

Adds the Bathlight and Delta Pavonis custom systems #4490

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@SpifforOmnivore
Contributor

SpifforOmnivore commented Nov 4, 2018

Adds Bathlight and Delta Pavonis custom systems

More info on the forum

@impaktor

This comment has been minimized.

Member

impaktor commented Nov 4, 2018

This has been merged, in d239106, but I had to re-write your commit due to two spelling errors (e.g. "spacious"), thus this changed the commit hash, and this PR doesn't show up as "merged".

I notice you're on your master branch, so I didn't want to force push my fix to your master.

You might want to do something like:

git fetch --all
git reset --hard upstream/master

(assuming you have set an upstream (git remote -v)

@impaktor impaktor closed this Nov 4, 2018

@SpifforOmnivore

This comment has been minimized.

Contributor

SpifforOmnivore commented Nov 4, 2018

Thanks Impaktor 👍

Actueally, my master branch is called "master", and I was working on my separate branch (called "spiffor"; maybe I should give it a more explicit name)

@impaktor

This comment has been minimized.

Member

impaktor commented Nov 4, 2018

Ah, right. I was mistaken.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment