Attempting to merge all .repo-tools/Docs_Automation/guids.json

Signed-off-by: Michael R Carroll <[email protected]>

Author: MichaelRoyceCarroll

.repo-tools/Docs_Automation/guids.json

@@ -1106,7 +1106,6 @@
         "removed": "False",
         "ver": "2021.1.Gold"
     },
-<<<<<<< HEAD
     "81B93386-B5EB-4998-B91B-3453263EC03E": {
         "guid": "81B93386-B5EB-4998-B91B-3453263EC03E",
         "ver": "2021.4.0",