From 697e43b859c35ee9c9385077d354f49f2ad1aa83 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Mon, 27 Feb 2023 08:38:05 -0500 Subject: [PATCH] fix: rebase on master and resolve package conflicts --- package-lock.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77ff7c8d7..5a394219e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,13 +35,8 @@ "devDependencies": { "@edx/brand": "npm:@edx/brand-openedx@1.2.0", "@edx/browserslist-config": "1.1.1", -<<<<<<< HEAD - "@edx/frontend-build": "12.4.16", - "@edx/paragon": "20.28.4", -======= "@edx/frontend-build": "12.5.6", - "@edx/paragon": "20.27.0", ->>>>>>> e8777c16 (chore: wip commit) + "@edx/paragon": "20.28.4", "axios-mock-adapter": "1.21.2", "core-js": "3.29.0", "enzyme": "3.11.0",