Merge branch 'flatpaks' of gitlab.com:gridtracker.org/gridtracker into flatpaks

.gitignore

@@ -11,4 +11,10 @@ debian/tmp
 node_modules
 package-lock.json
 .vscode
-desktop.ini
+desktop.ini
+.flatpak-builder
+generated-sources.json
+metadata
+flatpak
+flatpakrepo
+gridtracker-*.flatpak

.gitlab-ci.yml

@@ -86,11 +86,15 @@ win:package:
       7zr e NsProcess.zip -y -o/usr/share/nsis/Include/ Include/nsProcess.nsh
       7zr e NsProcess.zip -y -o/usr/share/nsis/Plugins/x86-unicode/ Plugin/nsProcessW.dll
       mv /usr/share/nsis/Plugins/x86-unicode/nsProcessW.dll /usr/share/nsis/Plugins/x86-unicode/nsProcess.dll
+<<<<<<< HEAD
 <<<<<<< HEAD
       curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
 =======
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
 >>>>>>> b4268a9 (cleanup)
+=======
+      echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
+>>>>>>> b4268a943eb14573a4495d0a4e8ab3db4931b22c
   script:
     - |
       # Making our Windows packages