24 lines
470 B
Plaintext
24 lines
470 B
Plaintext
<<<<<<< HEAD
|
|
{
|
|
"modelVersion": "5.0.4",
|
|
"description": "Please describe the basic information.",
|
|
"dependencies": {
|
|
},
|
|
"devDependencies": {
|
|
"@ohos/hypium": "1.0.21",
|
|
"@ohos/hamock": "1.0.0"
|
|
}
|
|
}
|
|
=======
|
|
{
|
|
"modelVersion": "5.0.4",
|
|
"description": "Please describe the basic information.",
|
|
"dependencies": {
|
|
},
|
|
"devDependencies": {
|
|
"@ohos/hypium": "1.0.21",
|
|
"@ohos/hamock": "1.0.0"
|
|
}
|
|
}
|
|
>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
|