rebase onceee more

theopensystemslab · Jul 12, 2024 · f7a3b56 · f7a3b56
2 parents ff93a74 + cfec66f
commit f7a3b56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
@@ -7,7 +7,11 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
+<<<<<<< HEAD
     "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#eb3b635",
+=======
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7666a78",
+>>>>>>> cfec66f3fc8a58e75fc8b71eb06ecbd1e9aea2a5
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,11 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#eb3b635",
+=======
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7666a78",
+>>>>>>> cfec66f3fc8a58e75fc8b71eb06ecbd1e9aea2a5
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",