fix

scality · Oct 30, 2023 · 13d349d · 13d349d
1 parent 34a32c9
commit 13d349d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -84,13 +84,9 @@
     "test": "jest tests/unit/policyEvaluator.spec.js",
     "build": "tsc",
     "prepare": "yarn build",
-<<<<<<< HEAD
     "ft_test": "jest tests/functional --testTimeout=120000 --forceExit",
     "coverage": "nyc --clean jest tests --coverage --testTimeout=120000 --forceExit",
     "build_doc": "cd documentation/listingAlgos/pics; dot -Tsvg delimiterVersionsStateChart.dot > delimiterVersionsStateChart.svg"
-=======
-    "ft_test": "jest tests/functional --testTimeout=120000 --forceExit"
->>>>>>> origin/w/7.70/improvement/ARSN-362-implicitDeny
   },
   "private": true,
   "jest": {