cleanup

dzsquared · dzsquared · commit 644bb3cc95ec · 2021-08-18T08:22:18.000-07:00
diff --git a/containers/dotnet-mssql/.devcontainer/docker-compose.yml b/containers/dotnet-mssql/.devcontainer/docker-compose.yml
@@ -7,11 +7,7 @@ services:
       dockerfile: Dockerfile
       args:
         # [Choice] Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
-<<<<<<< HEAD
         VARIANT: 5.0
-=======
-        VARIANT: 5.0
->>>>>>> ed772fa1702cc64f37e28eba05e8e69dcea71fb2
         # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
         NODE_VERSION: "lts/*"
         # [Option] Install Azure CLI
