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.

Sign up for GitHub

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

Jump to bottom

Zeepeetek feature/docs cleanup #276

Merged
merged 2 commits into from
Aug 3, 2020
Merged

Zeepeetek feature/docs cleanup #276

merged 2 commits into from
Aug 3, 2020

Conversation

omerdemirok
Copy link
Contributor

Description

Fix merge conflict.

Issues Resolved

List any existing issues this PR resolves, or any Discourse or StackOverflow discussion that's relevant

Check List

Bolesław Tekielski and others added 2 commits July 15, 2020 15:07
Fixed broken documentation links
ec4cac2 
Signed-off-by: Bolesław Tekielski <bolek@zeepeetek.pl>
Fix conflict
86b16ce 
Signed-off-by: Omer Demirok <odemirok@chef.io>
@omerdemirok omerdemirok requested a review from a team August 3, 2020 10:52
skpaterson
skpaterson approved these changes Aug 3, 2020
View reviewed changes
Copy link

@skpaterson skpaterson left a comment

Choose a reason for hiding this comment

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

Thanks @omerdemirok and @tboloo

@omerdemirok omerdemirok merged commit 022a21b into master Aug 3, 2020
@rmoles rmoles deleted the zeepeetek-feature/docs_cleanup branch August 7, 2020 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skpaterson skpaterson skpaterson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@omerdemirok @skpaterson