Resolve conflicts for `clipboard` package

21e025f2 · kushalpandya · 2cd479e0 · 21e025f2
Commit 21e025f2 authored Apr 26, 2017 by kushalpandya
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

yarn.lock yarn.lock +1 -5

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -1119,11 +1119,7 @@ cli-width@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"

-<<<<<<< HEAD
-clipboard@^1.6.1:
-=======
-clipboard@^1.5.5:
->>>>>>> upstream/master
+clipboard@^1.5.5, clipboard@^1.6.1:
  version "1.6.1"
  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.6.1.tgz#65c5b654812466b0faab82dc6ba0f1d2f8e4be53"
  dependencies: