Merge pull request facebook#150 from hktonylee/fixed_merge_typo_ISSUE…

…_TEMPLATE.md fixed merge typo in ISSUE_TEMPLATE.md
kalekseev · Aug 27, 2017 · a32ac09 · a32ac09
2 parents e87df91 + 1d83191
commit a32ac09
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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
+5. `npm ls react-scripts-ts` (if you haven’t ejected): 
 
 Then, specify: