Update from upstream repo 1egoman/sandb@master#14
Open
backstroke-bot wants to merge 2 commits into1egoman:masterfrom
Open
Update from upstream repo 1egoman/sandb@master#14backstroke-bot wants to merge 2 commits into1egoman:masterfrom
backstroke-bot wants to merge 2 commits into1egoman:masterfrom
Conversation
- Use a generic font provided by the OS - This runs on a mac now!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Hello!
The upstream repository
1egoman/sandb@masterhas some new changes that aren't in this repository. So, here they are, ready to be merged! 🎉Since this repository isn't related to the upstream, I've copied the contents of the upstream repository into the
1egomanbranch into a temporary repository to make syncing an out-of-network upstream possible - Read more.If this pull request can be merged without conflict, you can publish your softwarewith these new changes. Otherwise, fix any merge conflicts by clicking the
Resolve Conflictsbutton.Have fun!
Created by Backstroke (I'm a bot!)