From e098e5392943811daa11eec3a0e721fad2d0bbf9 Mon Sep 17 00:00:00 2001
From: Lynne <lynne@bune.city>
Date: Tue, 15 Jun 2021 09:47:44 +1000
Subject: [PATCH] ignore DotSettings, merge usernames w/ mailmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it is the official opinion of JetBrains s.r.o. that you shouldn't add your Rider® DotSettings.user files to your VCS
https://www.jetbrains.com/help/resharper/Sharing_Configuration_Options.html#solution-personal-layer

also i added a .mailmap file so that Lynnesbian and Lynne are considered the same author
---
 .gitignore | 1 +
 .mailmap   | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .mailmap

diff --git a/.gitignore b/.gitignore
index f7148ce..c7b4194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ yahoo.html
 /buypeeb.sln
 \#*.glade#
 userdata.json
+*.DotSettings.user
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..fcc90fb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Lynne <lynne@bune.city> Lynnesbian <lynne@bune.city>
\ No newline at end of file