diff --git a/domains/blog.jorgemayor.json b/domains/blog.jorgemayor.json index 7ccac1f8bb..dcc85a25e3 100644 --- a/domains/blog.jorgemayor.json +++ b/domains/blog.jorgemayor.json @@ -1,12 +1,15 @@ { "description": "Jorge Mayor's personal blog", - "domain": "is-a.dev", - "subdomain": "blog.jorgemayor", "owner": { "username": "Joorg3Mayoor", "email": "joorgemayoor@gmail.com" }, +<<<<<<< HEAD "record": { "A": ["88.0.97.219"] +======= + "records": { + "A": ["83.36.65.55"] +>>>>>>> 35673454fd414dfd5272e7189b05329739b65e98 } } diff --git a/domains/jorgemayor.json b/domains/jorgemayor.json index 468670a4ee..b2f615da20 100644 --- a/domains/jorgemayor.json +++ b/domains/jorgemayor.json @@ -1,5 +1,5 @@ { - "description": "Jorge Mayor's domain", + "description": "Jorge Mayor's personal website", "owner": { "username": "Joorg3Mayoor", "email": "joorgemayoor@gmail.com"