* [misc] resolve conflict.

This commit is contained in:
Chenjianyu
2024-08-12 15:48:27 +08:00
parent 7ee83ba0da
commit d336bb50c4
+2 -2
View File
@@ -1,8 +1,8 @@
{
"pkg": {
"xuanxuan": {
"gitVersion": "0d096a0244dc07432a44531f521caa85587811be",
"version": "9.0"
"gitVersion": "ba1a5aa068bdc44fc4123909f4df35a753160f01",
"version": "8.2"
},
"zentaoext": {
"gitRepo": "zentao/zentaoext"