From 450b05ddf27b58431e891529eb98370176aefaa6 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Tue, 22 Jan 2019 17:31:18 -0700
Subject: [PATCH] resolved merge conflicts

---
 content/v2.0/users/tokens/_index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/content/v2.0/users/tokens/_index.md b/content/v2.0/users/tokens/_index.md
index 53aa7ef6f..2b1282793 100644
--- 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**: