Merge pull request #804 from zvyn/patch-1

Remove merge conflict artifacts
TykTechnologies · Jun 6, 2019 · 34edfc2 · 34edfc2
2 parents 74e019d + 610e26e
commit 34edfc2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tyk-docs/content/tyk-dashboard-api/portal-developers.mmark b/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