24 lines
416 B
Plaintext
24 lines
416 B
Plaintext
<<<<<<< HEAD
|
|
{
|
|
"name": "entry",
|
|
"version": "1.0.0",
|
|
"description": "Please describe the basic information.",
|
|
"main": "",
|
|
"author": "",
|
|
"license": "",
|
|
"dependencies": {}
|
|
}
|
|
|
|
=======
|
|
{
|
|
"name": "entry",
|
|
"version": "1.0.0",
|
|
"description": "Please describe the basic information.",
|
|
"main": "",
|
|
"author": "",
|
|
"license": "",
|
|
"dependencies": {}
|
|
}
|
|
|
|
>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
|