Update .gitignore

Remove leftover merge conflict markers
Consolidate duplicate entries

Author: santaimpersonator

.gitignore

@@ -19,12 +19,7 @@
 ## BOM files
 *bom*
 
-<<<<<<< Updated upstream
-=======
-## VSCode directories
-.vscode
 
->>>>>>> Stashed changes
 #################
 ## Eclipse
 #################
@@ -60,11 +55,6 @@ local.properties
 ## Eagle
 #############
 
-<<<<<<< Updated upstream
-# Ignore the board and schematic backup files
-*.b#?
-*.s#?
-=======
 # Ignore the board and schematic backup files and lock files
 *.b#?
 *.s#?
@@ -85,14 +75,38 @@ local.properties
 #KiCad Backup files
 *.kicad_prl
 fp-info-cache
+sym-lib-table
 ~*.lck
 *-bak
 *-backups
 *-cache*
 *-bak*
+*.bak
 _autosave*
 \#auto_saved_files\#
->>>>>>> Stashed changes
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Virtual Environments
+venv/
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
 
 
 #################
@@ -102,6 +116,9 @@ _autosave*
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+## VSCode directories
+.vscode
+
 # User-specific files
 *.suo
 *.user
@@ -181,52 +198,42 @@ Backup*/
 UpgradeLog*.XML
 
 
-<<<<<<< Updated upstream
-=======
 # =========================
 # Operating System Files
 # =========================
 
->>>>>>> Stashed changes
 ############
 ## Windows
 ############
 
 # Windows image file caches
 Thumbs.db
-<<<<<<< Updated upstream
-=======
 ehthumbs.db
->>>>>>> Stashed changes
 
 # Folder config file
 Desktop.ini
 
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
 
 #############
-## Python
+## Linux
 #############
 
-<<<<<<< Updated upstream
-*.py[co]
+# backup files (*.bak on Win)
+*~
+
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-=======
 #############
 ## Mac OS
 #############
->>>>>>> Stashed changes
 
 # Installer logs
 pip-log.txt
@@ -235,6 +242,12 @@ pip-log.txt
 .coverage
 .tox
 
+# Icon must ends with two \r.
+Icon
+
+# Thumbnails
+._*
+
 #Translations
 *.mo
 
@@ -243,61 +256,12 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
-<<<<<<< Updated upstream
-=======
 
 # OSX
 # ===========
 .AppleDouble
 .LSOverride
 
-#############
-## Linux
-#############
-
-# backup files (*.bak on Win)
-*~
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Icon must ends with two \r.
-Icon
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-# Thumbnails
-._*
-
-#Translations
-*.mo
-
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
-
-#Mr Developer
-.mr.developer.cfg
->>>>>>> Stashed changes