fix conflict

This commit is contained in:
Nacho Codoñer
2024-06-11 14:24:55 +02:00
parent 0840e05cd8
commit 0c6ac52bca
2 changed files with 2574 additions and 1607 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@
"markdown-to-jsx": "4.0.3",
"meteor-node-stubs": "^1.2.7",
"mobx": "5.8.0",
"moment": "^2.22.2",
"moment": "^2.30.1",
"mssql": "^3.1.1",
"mysql": "^2.15.0",
"pify": "^4.0.1",