From 4b072cbe8b562bfc6f2c86ad794b3abc90bcc0d1 Mon Sep 17 00:00:00 2001
From: Parth Gupta <parthgupta2510@gmail.com>
Date: Wed, 27 Sep 2023 00:05:53 +0530
Subject: [PATCH] fix: GC Socult Data merge conflicts

---
 src/pages/results/GCdata.js | 169 ++++++++++++++----------------------
 1 file changed, 65 insertions(+), 104 deletions(-)

diff --git a/src/pages/results/GCdata.js b/src/pages/results/GCdata.js
index c4b398a9..09de25da 100644
--- a/src/pages/results/GCdata.js
+++ b/src/pages/results/GCdata.js
@@ -1270,12 +1270,72 @@ const GCdata = {
       ]
     },
     Technology: [
+      // {
+      //   Event: "Overall",
+      //   Gold: " ",
+      //   Silver: " ",
+      //   Bronze: " ",
+      // },
       {
-        Event: "Overall",
-        Gold: " ",
-        Silver: " ",
-        Bronze: " ",
-      }
+        Event: "OpenSoft",
+        Gold: "RP",
+        Silver: "RK",
+        Bronze: "MS",
+      },
+      {
+        Event: "Case Study",
+        Gold: "RK",
+        Silver: "RP",
+        Bronze: "VS",
+      },
+      {
+        Event: "Data Analytics",
+        Gold: "RK",
+        Silver: "RP",
+        Bronze: "VS",
+      },
+      // {
+      //   Event: "Product Design",
+      //   Gold: "LLR",
+      //   Silver: "RP",
+      //   Bronze: "Nehru",
+      // },
+      // {
+      //   Event: "Hardware Modelling",
+      //   Gold: "Azad",
+      //   Silver: "RP",
+      //   Bronze: "SN/IG",
+      // },
+      {
+        Event: "ChemQuest",
+        Gold: "RK",
+        Silver: "RP",
+        Bronze: "SNIG",
+      },
+      // {
+      //   Event: "Maths Olympiad",
+      //   Gold: "RP",
+      //   Silver: "Nehru",
+      //   Bronze: "RK",
+      // },
+      // {
+      //   Event: "Tech Quiz",
+      //   Gold: "RP",
+      //   Silver: "Azad",
+      //   Bronze: "LBS",
+      // },
+      // {
+      //   Event: "BizQuiz",
+      //   Gold: "Nehru",
+      //   Silver: "Azad",
+      //   Bronze: "LBS",
+      // },
+      {
+        Event: "Ad Design",
+        Gold: "RK",
+        Silver: "RP",
+        Bronze: "MS",
+      },
     ],
     Socult: [
       {
@@ -1407,105 +1467,6 @@ const GCdata = {
         Bronze: "SN/IG",
       },
     ]
-  },
-  "2022-23": {
-    Sports:
-    {
-      // MALE STANDINGS
-      Male: [
-        {
-          Sport: "Overall",
-          Gold: " ",
-          Silver: " ",
-          Bronze: " ",
-        }
-      ],
-      // FEMALE STANDINGS
-      Female: [
-        {
-          Sport: "Overall",
-          Gold: " ",
-          Silver: " ",
-          Bronze: " ",
-        }
-      ]
-    },
-    Technology: [
-      // {
-      //   Event: "Overall",
-      //   Gold: " ",
-      //   Silver: " ",
-      //   Bronze: " ",
-      // },
-      {
-        Event: "OpenSoft",
-        Gold: "RP",
-        Silver: "RK",
-        Bronze: "MS",
-      },
-      {
-        Event: "Case Study",
-        Gold: "RK",
-        Silver: "RP",
-        Bronze: "VS",
-      },
-      {
-        Event: "Data Analytics",
-        Gold: "RK",
-        Silver: "RP",
-        Bronze: "VS",
-      },
-      // {
-      //   Event: "Product Design",
-      //   Gold: "LLR",
-      //   Silver: "RP",
-      //   Bronze: "Nehru",
-      // },
-      // {
-      //   Event: "Hardware Modelling",
-      //   Gold: "Azad",
-      //   Silver: "RP",
-      //   Bronze: "SN/IG",
-      // },
-      {
-        Event: "ChemQuest",
-        Gold: "RK",
-        Silver: "RP",
-        Bronze: "SNIG",
-      },
-      // {
-      //   Event: "Maths Olympiad",
-      //   Gold: "RP",
-      //   Silver: "Nehru",
-      //   Bronze: "RK",
-      // },
-      // {
-      //   Event: "Tech Quiz",
-      //   Gold: "RP",
-      //   Silver: "Azad",
-      //   Bronze: "LBS",
-      // },
-      // {
-      //   Event: "BizQuiz",
-      //   Gold: "Nehru",
-      //   Silver: "Azad",
-      //   Bronze: "LBS",
-      // },
-      {
-        Event: "Ad Design",
-        Gold: "RK",
-        Silver: "RP",
-        Bronze: "MS",
-      },
-    ],
-    Socult: [
-      {
-        Event: "Overall",
-        Gold: " ",
-        Silver: " ",
-        Bronze: " ",
-      },
-    ]
   }
 };