mirror of
https://github.com/tiennm99/is-a-dev.git
synced 2026-10-13 10:15:47 +00:00
Fix merge conflict in blog.jorgemayor.json
Resolved merge conflict for the 'A' record IP address.
This commit is contained in:
1 parent
c609901b1f
commit
5175504357
1 file changed
-4
@@ -5,10 +5,6 @@
|
||||
"email": "joorgemayoor@gmail.com"
|
||||
},
|
||||
"records": {
|
||||
<<<<<<< HEAD
|
||||
"A": ["88.0.97.219"]
|
||||
=======
|
||||
"A": ["83.36.65.55"]
|
||||
>>>>>>> e9ec10b4e5e77d994eba261ece29e6221d0f10dd
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user