Skip to content

Update src/data/white_cards.yml#50

Open
Cyclical- wants to merge 2 commits into
berrycardsagainsthumanity:masterfrom
Cyclical-:patch-1
Open

Update src/data/white_cards.yml#50
Cyclical- wants to merge 2 commits into
berrycardsagainsthumanity:masterfrom
Cyclical-:patch-1

Conversation

@Cyclical-

Copy link
Copy Markdown

Potential white cards?

Potential white cards?
Comment thread src/data/white_cards.yml Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Don't want this space; these are supposed to show emotes if you have them turned on.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I didn't add those spaces, I guess NPP did it automatically.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hmm. I suppose it's one step better than BPM removing them completely, which has also happened.

@Cyclical-

Copy link
Copy Markdown
Author

What do you think of the ones I came up with?
I can do some black cards as well.

@pao

pao commented Feb 10, 2013

Copy link
Copy Markdown
Contributor

Marm is much more in tune with BT's sense of humor, so I'll leave that up to him. Just thought I'd try to help get all the mechanical issues swept out of the way.

@berrycardsagainsthumanity

Copy link
Copy Markdown
Owner

Hey jshaps, I took a look at these. I'm happy to merge them in, but I suck at git. Could you rebase and update your pull request?

@pao

pao commented Feb 19, 2013

Copy link
Copy Markdown
Contributor
git remote add jshaps https://github.com/jshaps/cah.git
git fetch jshaps
git checkout -t -b jshaps-cards jshaps/patch-1
git rebase master

There is a conflict, so you'll need to fix that, then:

git add -u
git rebase --continue

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants