From 966d59f8a48e360aaa3046a3fc500b07b4ad3a69 Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Tue, 22 Aug 2017 08:46:48 +0800 Subject: [PATCH 1/2] fixed merge typo in ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 405acc968..2fb83efe4 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -83,11 +83,7 @@ 2. `node -v`: 3. `npm -v`: 4. `yarn --version` (if you use Yarn): -<<<<<<< HEAD -5. `npm ls react-scripts` (if you haven’t ejected): -======= 3. `npm ls react-scripts-ts` (if you haven’t ejected): ->>>>>>> Fix Code Review Then, specify: From 1d8319111c497af3150324683600c19701c8aa6c Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Sun, 27 Aug 2017 11:56:34 +0800 Subject: [PATCH 2/2] changed list number in ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2fb83efe4..dc25d841a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -83,7 +83,7 @@ 2. `node -v`: 3. `npm -v`: 4. `yarn --version` (if you use Yarn): -3. `npm ls react-scripts-ts` (if you haven’t ejected): +5. `npm ls react-scripts-ts` (if you haven’t ejected): Then, specify: