From 2def353f75c6dd81cae8106944b2f19fd432d3e5 Mon Sep 17 00:00:00 2001
From: Satya siba Nayak <81738515+Satya-Siba-Nayak@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:35:33 +0530
Subject: [PATCH 1/3] Update satya.json

---
 domains/satya.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/domains/satya.json b/domains/satya.json
index 55210c4b00..1f70154706 100644
--- a/domains/satya.json
+++ b/domains/satya.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< Updated upstream
   "owner": {
     "username": "Satya-Siba-Nayak",
     "email": "ssnayak8806@gmail.com"
@@ -9,3 +10,15 @@
   "description": "My personal website/portfolio",
   "proxied": true
 }
+=======
+    "owner": {
+      "username": "Satya-Siba-Nayak",
+      "discord": "satya8806"
+    },
+    "records": {
+      "CNAME": "Satya-Siba-Nayak.github.io"
+    },
+    "description": "My personal website/portfolio",
+    "proxied": true
+  }
+>>>>>>> Stashed changes

From e8c6c8aec2e2476df1f61636c9cac8820b80492a Mon Sep 17 00:00:00 2001
From: Satya siba Nayak <81738515+Satya-Siba-Nayak@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:37:24 +0530
Subject: [PATCH 2/3] added Discord

---
 domains/satya.json | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/domains/satya.json b/domains/satya.json
index 1f70154706..9e285656d2 100644
--- a/domains/satya.json
+++ b/domains/satya.json
@@ -1,16 +1,4 @@
 {
-<<<<<<< Updated upstream
-  "owner": {
-    "username": "Satya-Siba-Nayak",
-    "email": "ssnayak8806@gmail.com"
-  },
-  "records": {
-    "CNAME": "Satya-Siba-Nayak.github.io"
-  },
-  "description": "My personal website/portfolio",
-  "proxied": true
-}
-=======
     "owner": {
       "username": "Satya-Siba-Nayak",
       "discord": "satya8806"
@@ -21,4 +9,3 @@
     "description": "My personal website/portfolio",
     "proxied": true
   }
->>>>>>> Stashed changes

From 0bde44b5b5a30b7b4b9fccfe75fbf8dad323aa77 Mon Sep 17 00:00:00 2001
From: Satya siba Nayak <81738515+Satya-Siba-Nayak@users.noreply.github.com>
Date: Mon, 25 Aug 2025 23:55:49 +0530
Subject: [PATCH 3/3] changed CNAME Record

---
 domains/satya.json | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/domains/satya.json b/domains/satya.json
index 1f70154706..cc3163e999 100644
--- a/domains/satya.json
+++ b/domains/satya.json
@@ -1,24 +1,11 @@
 {
-<<<<<<< Updated upstream
-  "owner": {
-    "username": "Satya-Siba-Nayak",
-    "email": "ssnayak8806@gmail.com"
-  },
-  "records": {
-    "CNAME": "Satya-Siba-Nayak.github.io"
-  },
-  "description": "My personal website/portfolio",
-  "proxied": true
-}
-=======
     "owner": {
       "username": "Satya-Siba-Nayak",
       "discord": "satya8806"
     },
     "records": {
-      "CNAME": "Satya-Siba-Nayak.github.io"
+      "CNAME": "satya.qzz.io"
     },
     "description": "My personal website/portfolio",
     "proxied": true
   }
->>>>>>> Stashed changes