Merge remote-tracking branch 'update/master'

This is a weird merge. I had re-written everything in a separate repository, and basically wanted that new repo (update) to be the new master of this repository, whilst preserving the history of the update repo. Here's what I did: $ git remote add update <path to update> $ git fetch update $ git merge -X theirs --allow-unrelated-histories update/master $ # remove extra files $ git commit --amend
GrouchoChaplin · Nov 15, 2019 · c6ac821 · c6ac821
2 parents d4c4777 + 9ad3f25
commit c6ac821
Show file tree

Hide file tree

Showing 46 changed files with 675 additions and 1,614 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+docs/ export-ignore
+resources/*.png export-ignore
+resources/*.py export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1 @@
-Thumbs.db
-__pycache__/
-cache.txt
-venv/
-site/
+__pycache__
diff --git a/.sublime/Default.sublime-keymap b/.sublime/Default.sublime-keymap
diff --git a/.sublime/Main.sublime-menu b/.sublime/Main.sublime-menu
diff --git a/.sublime/MarkdownLivePreview.sublime-commands b/.sublime/MarkdownLivePreview.sublime-commands
diff --git a/.sublime/MarkdownLivePreview.sublime-settings b/.sublime/MarkdownLivePreview.sublime-settings
diff --git a/.sublime/MarkdownLivePreviewSyntax.hidden-tmLanguage b/.sublime/MarkdownLivePreviewSyntax.hidden-tmLanguage
diff --git a/404.txt b/404.txt
diff --git a/MLPApi.py b/MLPApi.py