From 38f3e6b21a66a1c77995e75300b3a2daa034dd17 Mon Sep 17 00:00:00 2001
From: Rebecca Stevens <rebecca.stevens@outlook.co.nz>
Date: Thu, 12 Nov 2020 12:42:12 +1300
Subject: [PATCH 1/3] chore(editorconfig): declare the charset

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 6244e1b..aaac325 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,5 +3,6 @@ root = true
 [*]
 indent_style = tab
 end_of_line = lf
+charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

From dcf1ac3c752a4c7b02b46926e493f83c578c91a3 Mon Sep 17 00:00:00 2001
From: Rebecca Stevens <rebecca.stevens@outlook.co.nz>
Date: Tue, 17 Nov 2020 13:49:34 +1300
Subject: [PATCH 2/3] chore(editorconfig): use space instead of tabs for yaml
 files

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index aaac325..1c6314a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,3 +6,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

From 22b88a81ac3d5e069689934c05d1d2a73b385904 Mon Sep 17 00:00:00 2001
From: Rebecca Stevens <rebecca.stevens@outlook.co.nz>
Date: Sat, 19 Dec 2020 19:30:27 +1300
Subject: [PATCH 3/3] style(package.json): swap out spaces for tabs

---
 package.json | 96 ++++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 331b1d3..4755c1b 100644
--- a/package.json
+++ b/package.json
@@ -1,50 +1,50 @@
 {
-  "name": "deepmerge",
-  "version": "4.2.2",
-  "description": "A library for deep (recursive) merging of Javascript objects",
-  "keywords": [
-    "merge",
-    "deep",
-    "extend",
-    "copy",
-    "clone",
-    "recursive"
-  ],
-  "homepage": "https://github.com/TehShrike/deepmerge",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TehShrike/deepmerge.git"
-  },
-  "license": "MIT",
-  "main": "dist/cjs.js",
-  "files": [
-    "/dist",
-    "index.d.ts",
-    "changelog.md",
-    "license.txt",
-    "readme.md"
-  ],
-  "scripts": {
-    "build": "rollup -c",
-    "size": "npm run build && terser --compress --mangle -- ./dist/umd.js | gzip -c | wc -c",
-    "test": "npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript",
-    "test:typescript": "tsc --noEmit test/typescript.ts && ts-node test/typescript.ts"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^16.0.0",
-    "@rollup/plugin-node-resolve": "^10.0.0",
-    "@types/node": "^8.10.54",
-    "is-mergeable-object": "1.1.0",
-    "is-plain-obj": "^3.0.0",
-    "jsmd": "^1.0.2",
-    "rollup": "^2.33.1",
-    "tape": "^5.0.1",
-    "terser": "^5.5.1",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.1.2"
-  },
-  "engines": {
-    "node": ">=10"
-  }
+	"name": "deepmerge",
+	"version": "4.2.2",
+	"description": "A library for deep (recursive) merging of Javascript objects",
+	"keywords": [
+		"merge",
+		"deep",
+		"extend",
+		"copy",
+		"clone",
+		"recursive"
+	],
+	"homepage": "https://github.com/TehShrike/deepmerge",
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/TehShrike/deepmerge.git"
+	},
+	"license": "MIT",
+	"main": "dist/cjs.js",
+	"files": [
+		"/dist",
+		"index.d.ts",
+		"changelog.md",
+		"license.txt",
+		"readme.md"
+	],
+	"scripts": {
+		"build": "rollup -c",
+		"size": "npm run build && terser --compress --mangle -- ./dist/umd.js | gzip -c | wc -c",
+		"test": "npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript",
+		"test:typescript": "tsc --noEmit test/typescript.ts && ts-node test/typescript.ts"
+	},
+	"dependencies": {},
+	"devDependencies": {
+		"@rollup/plugin-commonjs": "^16.0.0",
+		"@rollup/plugin-node-resolve": "^10.0.0",
+		"@types/node": "^8.10.54",
+		"is-mergeable-object": "1.1.0",
+		"is-plain-obj": "^3.0.0",
+		"jsmd": "^1.0.2",
+		"rollup": "^2.33.1",
+		"tape": "^5.0.1",
+		"terser": "^5.5.1",
+		"ts-node": "^9.0.0",
+		"typescript": "^4.1.2"
+	},
+	"engines": {
+		"node": ">=10"
+	}
 }