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

Feature/hams #112

Merged
merged 9 commits into from
May 9, 2019
Merged

Feature/hams #112

merged 9 commits into from
May 9, 2019

Conversation

erikpoort
Copy link
Contributor

Hi @vadymmarkov,

I added a nice feature!
It generates different types of hams in English.

Could benefit some people :)

@dunyakirkali
Copy link
Contributor

@erikpoort Could you also update the README.md with some usage instructions?

@erikpoort
Copy link
Contributor Author

I hammered in a piece of example code, it's cured now.

@dunyakirkali
Copy link
Contributor

Smokin' ham dude! Thanx

Copy link
Owner

@vadymmarkov vadymmarkov left a comment

Choose a reason for hiding this comment

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

Nice one @erikpoort 😅 I think we should also add this generator to https://github.com/vadymmarkov/Fakery/blob/master/Sources/Fakery/Faker.swift to make it accessible.

Erik Poort added 4 commits May 9, 2019 16:03
# Conflicts:
#	Fakery.xcodeproj/project.pbxproj
#	README.md
#	Resources/Locales/en-TEST.json
#	Resources/Locales/en.json
#	Sources/Fakery/Faker.swift
#	Tests/Fakery/FakerSpec.swift
# Conflicts:
#	Resources/Locales/en-TEST.json
#	Resources/Locales/en.json
@erikpoort
Copy link
Contributor Author

@vadymmarkov had to resolve some conflicts, but it's ready!

@vadymmarkov
Copy link
Owner

Great @erikpoort

@vadymmarkov vadymmarkov merged commit 47a87f9 into vadymmarkov:master May 9, 2019
@erikpoort erikpoort deleted the feature/hams branch May 10, 2019 16:59
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.

None yet

4 participants