From 7a273dce5af6eacc5d65e35eb4c5390c2a84e123 Mon Sep 17 00:00:00 2001
From: Lakshman Kumar Peethani <peethani@outlook.com>
Date: Fri, 6 Oct 2023 22:42:17 +0530
Subject: [PATCH] fixed merge issues.

---
 .vscode/settings.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2abfd1a..77a1241 100644
--- 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
-    }
-}
\ No newline at end of file
+        "projectKey": "plkumar_mqcat",
+        "github.copilot.enable": {
+            "*": true,
+            "plaintext": false,
+            "markdown": false,
+            "scminput": false
+        }
+    }
\ No newline at end of file