Remove a stray conflict marker
This commit is contained in:
parent
b9425af234
commit
5b4fd6fe66
|
@ -1,4 +1,3 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
{
|
{
|
||||||
"Me":{
|
"Me":{
|
||||||
"name":"Savanni",
|
"name":"Savanni",
|
||||||
|
|
Loading…
Reference in New Issue