From 4a1e5d6862ee4e7697e2dacb6932f40e1d764fbc Mon Sep 17 00:00:00 2001
From: Vladimir Gorej <vladimir.gorej@gmail.com>
Date: Fri, 11 Jun 2021 12:13:40 +0200
Subject: [PATCH] chore(deps): update redux-immutable-pure-component to 2.2.0

Refs #7341
---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index b0eaa565..0e9dff74 100644
--- a/package.json
+++ b/package.json
@@ -85,11 +85,7 @@
     "react-motion": "^0.5.2",
     "react-redux": "=7.2.4",
     "react-syntax-highlighter": "^15.4.3",
-<<<<<<< HEAD
     "redux": "=4.1.0",
-=======
-    "redux": "=3.7.2",
->>>>>>> chore(deps-dev): update redux-immutable to v4.0.0
     "redux-immutable": "=4.0.0",
     "remarkable": "^2.0.1",
     "reselect": "^4.0.0",