Merge pull request #14 from adespresso/editorconfig

Added editorconfig configuration
adespresso · Mar 31, 2016 · ad56cc8 · ad56cc8
2 parents 724cf0a + d571912
commit ad56cc8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,4 +23,4 @@ However, be sure to take a look to our guidelines before you start. It's not abo
 * If you are fixing a bug, the related branch name should start with "fix-";
 * Use imperative present tense for git commit messages, not past tense. We like this way;
 * Name your branch with a meaningful name. For instance, "add-phpunit-as-dependency" is good, "branch-for-issue-1234" is not; 
-* Here on GitHub we use Scrutinizr to scan code and Travis to run tests for better results. Every time you send a pull request, your code (and your tests) will be analyzed (and executed). As you probably imagine, **if you break tests or something goes wrong we can't merge your code**. So, double check your code and use the flags here on GitHub to keep an eye on the situation.
+* Here on GitHub we use Scrutinizr to scan code and Travis to run tests for better results. Every time you send a pull request, your code (and your tests) will be analyzed (and executed). As you probably imagine, **if you break tests or something goes wrong we can't merge your code**. So, double check your code and use the flags here on GitHub to keep an eye on the situation.