fix merge conflicts
This commit is contained in:
1 parent
3e00f5c120
commit
09a51ea3fd
1 file changed
+1
-1
@@ -78,5 +78,5 @@
|
|||||||
"uuid": "^8.3.1",
|
"uuid": "^8.3.1",
|
||||||
"winston": "^3.2.1"
|
"winston": "^3.2.1"
|
||||||
},
|
},
|
||||||
"gitHead": "245ccdc4774965cdd27d4dbdb5fbb084c8066c66"
|
"gitHead": "982da259ed93fe1b618800c8693a5c9dfe312532"
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user