From 632aae8bcdc2d6d9b30e1bf9d3a31af117913a95 Mon Sep 17 00:00:00 2001
From: Jeremy Hamilton <jeremy.hamilton@tekfive.com>
Date: Tue, 11 Aug 2020 18:58:18 -0700
Subject: [PATCH] fix merge conflict bug

---
 .../version-2.2.1-sidebars.json               | 124 ------------------
 1 file changed, 124 deletions(-)

diff --git a/website/versioned_sidebars/version-2.2.1-sidebars.json b/website/versioned_sidebars/version-2.2.1-sidebars.json
index 4c57b8abe2..ed85601c6d 100644
--- a/website/versioned_sidebars/version-2.2.1-sidebars.json
+++ b/website/versioned_sidebars/version-2.2.1-sidebars.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD:website/versioned_sidebars/version-2.2.0-sidebars.json
-  "version-2.2.0/docs": [
-=======
   "version-2.2.1/docs": [
->>>>>>> patch:website/versioned_sidebars/version-2.2.1-sidebars.json
     {
       "collapsed": true,
       "type": "category",
@@ -11,25 +7,6 @@
       "items": [
         {
           "type": "doc",
-<<<<<<< HEAD:website/versioned_sidebars/version-2.2.0-sidebars.json
-          "id": "version-2.2.0/getting_started"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/customization"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/web_usage"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/troubleshooting"
-=======
           "id": "version-2.2.1/getting_started"
         },
         {
@@ -47,7 +24,6 @@
         {
           "type": "doc",
           "id": "version-2.2.1/troubleshooting"
->>>>>>> patch:website/versioned_sidebars/version-2.2.1-sidebars.json
         }
       ]
     },
@@ -58,93 +34,6 @@
       "items": [
         {
           "type": "doc",
-<<<<<<< HEAD:website/versioned_sidebars/version-2.2.0-sidebars.json
-          "id": "version-2.2.0/avatar"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/badge"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/bottomsheet"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/button"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/button_group"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/card"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/checkbox"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/divider"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/header"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/icon"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/image"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/input"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/listitem"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/overlay"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/pricing"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/rating"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/searchbar"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/slider"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/social_icon"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/text"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/tile"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/tooltip"
-=======
           "id": "version-2.2.1/avatar"
         },
         {
@@ -230,7 +119,6 @@
         {
           "type": "doc",
           "id": "version-2.2.1/tooltip"
->>>>>>> patch:website/versioned_sidebars/version-2.2.1-sidebars.json
         }
       ]
     },
@@ -241,17 +129,6 @@
       "items": [
         {
           "type": "doc",
-<<<<<<< HEAD:website/versioned_sidebars/version-2.2.0-sidebars.json
-          "id": "version-2.2.0/contributing"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/testing"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.2.0/labels"
-=======
           "id": "version-2.2.1/contributing"
         },
         {
@@ -261,7 +138,6 @@
         {
           "type": "doc",
           "id": "version-2.2.1/labels"
->>>>>>> patch:website/versioned_sidebars/version-2.2.1-sidebars.json
         }
       ]
     }