fixed merge issues.

plkumar · Oct 6, 2023 · 7a273dc · 7a273dc
1 parent 371be78
commit 7a273dc
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,13 +2,11 @@
     "dotnet.defaultSolution": "mqcat.sln",
     "sonarlint.connectedMode.project": {
         "connectionId": "plkumar",
-        "projectKey": "plkumar_mqcat"
-    }
-    "dotnet.defaultSolution": "mqcat.sln",
-    "github.copilot.enable":{
-        "*": true,
-        "plaintext": false,
-        "markdown": false,
-        "scminput": false
-    }
-}
+        "projectKey": "plkumar_mqcat",
+        "github.copilot.enable": {
+            "*": true,
+            "plaintext": false,
+            "markdown": false,
+            "scminput": false
+        }
+    }