Skip to content

Commit

Permalink
Cause a conflict
Browse files Browse the repository at this point in the history
- Eugene Fedorenko: 1

- Eugene Fedorenko: sss
  • Loading branch information
efedorenko committed Jul 18, 2019
1 parent f2b7ac8 commit 5e910c6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ quote_type = single
spaces_around_operators = true

[*.md]
trim_trailing_whitespace = false
trim_trailing_whitespace = false or true

[*.txt]

0 comments on commit 5e910c6

Please sign in to comment.