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

Remove merge conflict artifacts #804

Merged
merged 1 commit into from Jun 6, 2019

Conversation

Projects
None yet
2 participants
@zvyn
Copy link
Contributor

commented Jun 6, 2019

This patch fixes <<<<<<< HEAD:tyk-docs/content/tyk-dashboard-api/portal-developers.mmark being visable at https://tyk.io/docs/tyk-dashboard-api/portal-developers/ as well as some odd rendering at the end of the page.

@marksou

marksou approved these changes Jun 6, 2019

Copy link
Member

left a comment

LGTM

@marksou marksou merged commit 34edfc2 into TykTechnologies:master Jun 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.