chore: Merge conflicts with master
This commit is contained in:
commit
24604f1b71
80 files changed
+1946
-1671
No files matched your search
@@ -3,7 +3,7 @@ const path = require("path")
|
||||
const { bootstrapApp } = require("../../../helpers/bootstrap-app")
|
||||
const { initDb, useDb } = require("../../../helpers/use-db")
|
||||
|
||||
jest.setTimeout(30000)
|
||||
jest.setTimeout(50000)
|
||||
|
||||
describe("Inventory Module", () => {
|
||||
let appContainer
|
||||
|
||||
Reference in new issue
Block a user