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 1 commit into from Jun 6, 2019


None yet
2 participants
Copy link

commented Jun 6, 2019

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


marksou approved these changes Jun 6, 2019

Copy link

left a comment


@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.