From bb7e111bb0e3c1925bcddcdbc5cdbb7fe4c5e477 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 16 Nov 2020 06:45:20 -0800
Subject: [PATCH] Delete unnecessary entry in global.json (#44709)

---
 global.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/global.json b/global.json
index 794e04e..a67f1ea 100644
--- a/global.json
+++ b/global.json
@@ -17,7 +17,6 @@
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20552.5",
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20560.1",
     "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20552.5",
-    "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20557.2",
     "Microsoft.Build.NoTargets": "2.0.1",
     "Microsoft.Build.Traversal": "2.1.1"
-- 
2.7.4