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.

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

Add more quotes to Faker::Games::Witcher #2163

Merged
merged 1 commit into from
Oct 18, 2020

Conversation

RubyHuntsman
Copy link
Contributor

No-Story

Description:

I added more quotes to Faker::Games::Witcher

@boardfish
Copy link
Contributor

Seems like you made this branch off the same branch from #2159. You might want to do the following locally:

git rebase -i HEAD~3

Then drop the two commits from the Camera branch and force push to this branch.

@RubyHuntsman
Copy link
Contributor Author

You mean adding things from #2159 in that pull the request together?

@boardfish
Copy link
Contributor

That's what's happened here. You can use what I posted to remove the camera commits from this branch.

@RubyHuntsman RubyHuntsman force-pushed the add-more-quotes-witcher branch from cfb1433 to f994dec Compare October 18, 2020 15:08
@RubyHuntsman
Copy link
Contributor Author

Ok, now I understand

@boardfish
Copy link
Contributor

Nice, that's fixed it.

@vbrazo vbrazo merged commit bb1b7c1 into faker-ruby:master Oct 18, 2020
@RubyHuntsman RubyHuntsman deleted the add-more-quotes-witcher branch October 18, 2020 22:26
droznyk pushed a commit to droznyk/faker that referenced this pull request Oct 23, 2020
droznyk added a commit to droznyk/faker that referenced this pull request Oct 23, 2020
droznyk added a commit to droznyk/faker that referenced this pull request Oct 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants