!356 fix:修复了更新器安装完成后显示下载完成的bug

Merge pull request !356 from momen/Thunder

.gitignore

@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-=======
-build
-.vscode
-.cache
-CMakeLists.txt.user
-CMakeLists.txt.user.*
-obj-x86_64-linux-gnu
->>>>>>> update-tool/dev
 # C++ objects and libs
 *.slo
 *.lo
@@ -15,10 +6,7 @@ obj-x86_64-linux-gnu
 *.la
 *.lai
 *.so
-<<<<<<< HEAD
 *.so.*
-=======
->>>>>>> update-tool/dev
 *.dll
 *.dylib
 
@@ -41,21 +29,12 @@ ui_*.h
 *.jsc
 Makefile*
 *build-*
-<<<<<<< HEAD
 *.qm
 *.prl
-=======
->>>>>>> update-tool/dev
 
 # Qt unit tests
 target_wrapper.*
 
-<<<<<<< HEAD
-=======
-# Qt qm files
-translations/*.qm
-
->>>>>>> update-tool/dev
 # QtCreator
 *.autosave
 
@@ -65,7 +44,6 @@ translations/*.qm
 
 # QtCreator CMake
 CMakeLists.txt.user*
-<<<<<<< HEAD
 
 # QtCreator 4.8< compilation database
 compile_commands.json
@@ -85,15 +63,4 @@ debian/spark-store
 build
 obj-*
 .vscode
-=======
-build
-
-# Debian dpkg-buildpackage
-debian/*.debhelper*
-debian/files
-debian/*.substvars
-debian/spark-update-tool
-
-.vscode/*
-src/spark-update-tool
->>>>>>> update-tool/dev
+.cache