Validate cursorColor value and apply default if it fails #590
Merged
leo merged 1 commit intovercel:masterfrom Aug 18, 2016
Merged
Validate cursorColor value and apply default if it fails #590leo merged 1 commit intovercel:masterfrom
leo merged 1 commit intovercel:masterfrom
Conversation
Contributor
|
👌 Please rebase. |
Contributor
Author
|
Was that rebase correct? Is this good to be merged now? |
Contributor
|
@jwhitmarsh I'm getting "This branch is out-of-date with the base branch - Merge the latest changes from master into this branch." |
refactor `validateColor`: remove unnecessary variable declaration
Contributor
Author
|
Sorry, it was showing up as 'Good to merge' for me - i've re-rebased it :) |
Contributor
|
Thanks a lot! 😊 |
chabou
added a commit
to chabou/hyper
that referenced
this pull request
Aug 19, 2016
* master: chore(package): update react to version 15.3.1 (vercel#637) Fix vercel#527: validate cursorColor value and apply default if it fails (vercel#590) Added customChildrenBefore to the tabs. (vercel#580) Fix for markdown files (vercel#618) Provide clear selection of text in terminal view (vercel#608) Added shellArgs to the config. (vercel#572) Fix international tilde character, and ` and ´ (vercel#584) chore(package): update electron-prebuilt to version 1.3.3 (vercel#604) chore(package): update should to version 11.0.0 (vercel#602) Comments for ignored stuff A little shorter Unneeded space Open new window offset from last focused window (Credit: albinekb) (vercel#581) Fix maximizing behaviour (vercel#176) Fix mapXDispatch and allow plugin to access onWheel (credit: lkzhao) (vercel#578) Use single quotes for better compatibility (vercel#575) Add config for bell (vercel#468) chore(package): update electron-prebuilt to version 1.3.2 (vercel#553) Moved "file-uri-to-path" dep to app package.json (vercel#569)
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
4 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.
Originally was #562 but I did the work on master, so switched it to a branch. Apologies for the mess!
Fixes 527