Remove a stray conflict marker

This commit is contained in:
Savanni D'Gerinel 2023-08-29 23:10:47 -04:00
parent b9425af234
commit 5b4fd6fe66
1 changed files with 0 additions and 1 deletions

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{
"Me":{
"name":"Savanni",