Skip to content
Permalink
Browse files

Merge pull request #804 from zvyn/patch-1

Remove merge conflict artifacts
  • Loading branch information...
marksou committed Jun 6, 2019
2 parents 74e019d + 610e26e commit 34edfc229deb8316eb4d8fb95f0fb56ab3a31100
Showing with 0 additions and 4 deletions.
  1. +0 −4 tyk-docs/content/tyk-dashboard-api/portal-developers.mmark
@@ -311,10 +311,8 @@ curl https://admin.cloud.tyk.io/api/portal/developers/password/:Id \
}
```

<<<<<<< HEAD:tyk-docs/content/tyk-dashboard-api/portal-developers.mmark
<span data-filetype="mmark"></span>
{{./static/include/portal-developer-analytics.md}}
=======

### Add Subscription To Developer

@@ -384,5 +382,3 @@ curl https://admin.cloud.tyk.io/api//portal/developers/:Id/subscriptions \
| Type | None |
| Body | None |
| Param | None |

>>>>>>> master:tyk-docs/content/tyk-dashboard-api/portal-developers.md

0 comments on commit 34edfc2

Please sign in to comment.
You can’t perform that action at this time.