From 03293c0d258648a18509c1a6a7ca78792d5f44ce Mon Sep 17 00:00:00 2001
From: kawmra <m.kawmra@gmail.com>
Date: Sat, 2 Jun 2018 22:59:49 +0900
Subject: [PATCH 1/2] Fix conflict of yarn.lock

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

diff --git a/yarn.lock b/yarn.lock
index a0d630dd..91e0d436 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2777,11 +2777,7 @@ eslint-plugin-promise@~3.4.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
 
-<<<<<<< HEAD
 eslint-plugin-react@^7.8.2:
-=======
-eslint-plugin-react@^7.2.0:
->>>>>>> ca0b03e97ce59824c9730f08c15590c5f31ebfb0
   version "7.8.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
   dependencies:

From 30378eeb50ba08ad51f2ada5c2651ba66ce69ba0 Mon Sep 17 00:00:00 2001
From: kawmra <m.kawmra@gmail.com>
Date: Sat, 2 Jun 2018 23:01:52 +0900
Subject: [PATCH 2/2] Remove unnecessary lines

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

diff --git a/yarn.lock b/yarn.lock
index 91e0d436..65a68784 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2382,12 +2382,6 @@ doctrine@^2.0.0, doctrine@^2.0.2:
   dependencies:
     esutils "^2.0.2"
 
-doctrine@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  dependencies:
-    esutils "^2.0.2"
-
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"