From 73ed3c1d56b6838f877a5f8e8412b060f0a5b321 Mon Sep 17 00:00:00 2001
From: Pranshu Chittora <pranshuchittora17@gmail.com>
Date: Mon, 22 Apr 2019 19:41:59 +0530
Subject: [PATCH] docs(contribute): resolves merge conflicts

trying to resolve merge conflicts
---
 .github/CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 290ab8ae14a..fdbe496efe6 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -180,6 +180,7 @@ In case you are suggesting a new feature, we will match your idea with our curre
     yarn lint && yarn tslint
     ```
 
+
 ## Editor Config
 
 The [.editorconfig](https://github.com/webpack/webpack-cli/blob/master/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.