From 94b192c96f67346c179327378dc71cde54aac199 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Mon, 16 Jul 2018 10:26:56 +0200
Subject: [PATCH] fix merge issue

---
 yarn.lock | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bdc8665cff9..853394b5765 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1893,13 +1893,6 @@ eslint-plugin-prettier@^2.6.2:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
-eslint-scope@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"