From f390746c8e6676720e07430a5b5876c157a7dce9 Mon Sep 17 00:00:00 2001
From: ConchDev <unsoughtconch@gmail.com>
Date: Tue, 17 May 2022 12:29:37 -0400
Subject: [PATCH] Add mypy_cache to gitignore, merge branches

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fcb9d45..d82bcca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 __pycache__/
 uwuinator-archive/
-.vscode/
\ No newline at end of file
+.vscode/
+.mypy_cache/
\ No newline at end of file