From 0c9573ae4c138e8030d726dee6129603e3fee5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20B=C5=82=C4=99dkowski?=
 <23295125+mbledkowski@users.noreply.github.com>
Date: Wed, 2 Sep 2020 05:47:53 +0200
Subject: [PATCH] fixes merge conflict

---
 package.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package.json b/package.json
index d809f6d5..50d274e5 100644
--- a/package.json
+++ b/package.json
@@ -19,17 +19,10 @@
     "@types/firefox-webext-browser": "70.0.1",
     "@types/jest": "^24.0.23",
     "@types/jquery": "^3.3.31",
-<<<<<<< HEAD
-    "copy-webpack-plugin": "^5.0.5",
-    "jest": "^26.2.2",
-    "rimraf": "^3.0.0",
-    "ts-jest": "^26.1.4",
-=======
     "copy-webpack-plugin": "^6.0.3",
     "jest": "^26.4.0",
     "rimraf": "^3.0.0",
     "ts-jest": "^26.2.0",
->>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422
     "ts-loader": "^6.2.1",
     "typescript": "~3.7.3",
     "web-ext": "^5.0.0",