diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a892658
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+
+[*.ps1]
+charset = utf-8-bom
+end_of_line = crlf
+
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9b3db83
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.ps1 text eol=crlf
+
diff --git a/README.md b/README.md
index 877bc1c..2153210 100644
--- a/README.md
+++ b/README.md
@@ -78,3 +78,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "D:\Soft\Login_Monitor.p
 - если процесса нет — запускает монитор;
 - если heartbeat старше `$HeartbeatStaleMinutes` (по умолчанию 90 минут) — перезапускает монитор.
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 68f8bcb (Add editor/gitattributes defaults for PowerShell encoding)