From c14927dcd1568c33c3ae4cc846eff12fc4aa362a Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Tue, 2 Apr 2019 12:51:30 +0200
Subject: Resolve CE/EE difference in FE dependency files

This resolved the one conflict we have in CE/EE.
---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package.json')

diff --git a/package.json b/package.json
index a2d96cc551a..d672370e9a3 100644
--- a/package.json
+++ b/package.json
@@ -56,11 +56,13 @@
     "d3-array": "^1.2.1",
     "d3-axis": "^1.0.8",
     "d3-brush": "^1.0.4",
+    "d3-ease": "^1.0.3",
     "d3-scale": "^1.0.7",
     "d3-selection": "^1.2.0",
     "d3-shape": "^1.2.0",
     "d3-time": "^1.0.8",
     "d3-time-format": "^2.1.1",
+    "d3-transition": "^1.1.1",
     "dateformat": "^3.0.3",
     "deckar01-task_list": "^2.2.0",
     "diff": "^3.4.0",
-- 
cgit v1.2.1