Delete unnecessary entry in global.json (#44709)

dotnet · Nov 16, 2020 · bb7e111 · bb7e111
1 parent 83d8561
commit bb7e111
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"