Resolve yarn.lock

88fe2aba · Lin Jen-Shin · 0bb98898 · 88fe2aba
Commit 88fe2aba authored Dec 27, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

yarn.lock yarn.lock +0 -4

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -1741,11 +1741,7 @@ d3-drag@1:
    d3-dispatch "1"
    d3-selection "1"

-<<<<<<< HEAD
 d3-ease@1, d3-ease@^1.0.3:
-=======
-d3-ease@1:
->>>>>>> upstream/master
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"