From 9fd2293df430cbc8a12f95df606be6e66eb9e871 Mon Sep 17 00:00:00 2001 From: dandelany Date: Tue, 18 Jun 2024 15:30:07 -0700 Subject: [PATCH] fix conflict in package-lock.json --- sequencing-server/package-lock.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sequencing-server/package-lock.json b/sequencing-server/package-lock.json index a22efbba7d..747a91041a 100644 --- a/sequencing-server/package-lock.json +++ b/sequencing-server/package-lock.json @@ -10,11 +10,7 @@ "license": "MIT", "dependencies": { "@js-temporal/polyfill": "~0.4.3", -<<<<<<< HEAD "@nasa-jpl/aerie-ampcs": "~1.0.6", -======= - "@nasa-jpl/aerie-ampcs": "~1.0.5", ->>>>>>> 114d4eb22 (update package-lock with new version of aerie-ts-code-runner in sequencing-server) "@nasa-jpl/aerie-ts-user-code-runner": "~0.7.0", "@nasa-jpl/seq-json-schema": "1.0.20", "body-parser": "~1.20.1",