fix yarn.lock

y13i · May 5, 2017 · 2d82fe3 · 2d82fe3
1 parent b6e712a
commit 2d82fe3
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -3205,15 +3205,9 @@ typescript@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
 
-<<<<<<< HEAD
-typescript@rc:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418"
-=======
 typescript@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.2.tgz#f0f045e196f69a72f06b25fd3bd39d01c3ce9984"
->>>>>>> master
 
 uglify-js@^2.6:
   version "2.8.22"