From 5e910c611a311ef9e36ef1391c78fa06776d3d0c Mon Sep 17 00:00:00 2001
From: Eugene Fedorenko <eugene@wildbit.com>
Date: Thu, 18 Jul 2019 18:46:59 +0300
Subject: [PATCH] Cause a conflict

- Eugene Fedorenko: 1

- Eugene Fedorenko: sss
---
 .editorconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 6532c52..9a4dd55 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,4 +14,6 @@ quote_type = single
 spaces_around_operators = true
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false or true
+
+[*.txt]