resolved merge conflicts

2019-01-22 17:31:18 -07:00 · 2019-01-22 17:31:18 -07:00 · 450b05ddf2
parent 9357144699
commit 450b05ddf2
1 changed files with 0 additions and 6 deletions
--- a/content/v2.0/users/tokens/_index.md
+++ b/content/v2.0/users/tokens/_index.md
@ -3,15 +3,9 @@ title: Manage tokens in InfluxDB
 description: placeholder
 menu:
  v2_0:
-<<<<<<< HEAD:content/v2.0/users/tokens/_index.md
    name: Manage tokens
    parent: Manage users
    weight: 2
-=======
-    name: Managing tokens
-    weight: 1
-    parent: Placeholder parent
->>>>>>> master:content/v2.0/ui/tokens.md
 ---

 **To view tokens**: