fix merge conflicts

2021-03-17 14:50:07 +01:00
parent 8fc6b26cb8 9ac68615a0
commit 7872d37c04
65 changed files with 3527 additions and 2619 deletions
@@ -59,6 +59,7 @@ describe("/store/gift-cards", () => {
        code: "GC_TEST",
        value: 200,
        balance: 120,
+        region: expect.any(Object),
      });
    });
  });