edited excluded files

Author: unalignedcoder

.gitignore

@@ -363,12 +363,6 @@ MigrationBackup/
 FodyWeavers.xsd
 /CalibreImport/release.yml
 /CalibreImport/Properties/AssemblyInfo.cs.bak
-
-CalibreImport.sln
-/CalibreImport/Properties/AssemblyInfo.cs.bak
-<<<<<<< HEAD
-/CalibreImportShellExtension.sln
-=======
->>>>>>> c803078837eb51250f71ecd05dd49c329db229e3
 /CalibreImportShellExtension.sln
 /CalibreImport/ReleaseFiles/SetupLog.txt
+old-stuff/