From 805bbd33b6cb14fd0006636f2bbb786fbb0bf535 Mon Sep 17 00:00:00 2001 From: Jorge Mayor Date: Sun, 31 May 2026 17:10:11 +0200 Subject: [PATCH 1/2] Solve New IP for blog page --- domains/blog.jorgemayor.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/domains/blog.jorgemayor.json b/domains/blog.jorgemayor.json index dcc85a25e3..c27e3c39a1 100644 --- a/domains/blog.jorgemayor.json +++ b/domains/blog.jorgemayor.json @@ -4,12 +4,7 @@ "username": "Joorg3Mayoor", "email": "joorgemayoor@gmail.com" }, -<<<<<<< HEAD - "record": { - "A": ["88.0.97.219"] -======= "records": { - "A": ["83.36.65.55"] ->>>>>>> 35673454fd414dfd5272e7189b05329739b65e98 + "A": ["88.0.97.219"] } } From 51755043576328c51455a16b28709732ca09c4f8 Mon Sep 17 00:00:00 2001 From: Jorge Mayor Date: Sun, 31 May 2026 17:16:16 +0200 Subject: [PATCH 2/2] Fix merge conflict in blog.jorgemayor.json Resolved merge conflict for the 'A' record IP address. --- domains/blog.jorgemayor.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/domains/blog.jorgemayor.json b/domains/blog.jorgemayor.json index d3ac04d665..c27e3c39a1 100644 --- a/domains/blog.jorgemayor.json +++ b/domains/blog.jorgemayor.json @@ -5,10 +5,6 @@ "email": "joorgemayoor@gmail.com" }, "records": { -<<<<<<< HEAD "A": ["88.0.97.219"] -======= - "A": ["83.36.65.55"] ->>>>>>> e9ec10b4e5e77d994eba261ece29e6221d0f10dd } }