<<<<<<< HEAD
.idea/*
*.user
/Client/obj/Debug
/ImageManager/obj/Debug
/Launcher/obj/Debug
/Library/obj/Debug
/PatchManager/obj/Debug
/Patcher/obj/Debug
/Server/obj/Debug
/.vs/Zircon Server/v15/Server/sqlite3
/LibraryEditor/obj
/LibraryEditor/bin
/Build/LibraryEditor/Exported
/.vs/Zircon Server/v15/*.suo
/Build/LibraryEditor

/packages/Ionic.Zlib.1.9.1.5
=======
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk
>>>>>>> 33948fd497c679adffa466e72ebb8f0bffebd5e9