fix merge conflicts

2021-09-16 22:21:41 +02:00 · 2021-09-16 22:21:41 +02:00 · c009ec4b59
parent 104a84d19b bede089cbe
commit c009ec4b59
2 changed files with 2 additions and 2 deletions
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@ -2151,7 +2151,7 @@
          "setting": "optionsSource",
          "value": "provider"
        }
-      },
+      }, 
      {
        "type": "options",
        "key": "customOptions",
--- a/packages/server/src/db/tests/linkTests.spec.js
+++ b/packages/server/src/db/tests/linkTests.spec.js
@ -59,4 +59,4 @@ describe("test link functionality", () => {
      expect(Array.isArray(output)).toBe(true)
    })
  })
-})
+})