From 12bb8364eac175b56e7a0c3d27ba13ed86699a8d Mon Sep 17 00:00:00 2001 From: nr0q Date: Sat, 21 Oct 2023 10:15:12 -0500 Subject: [PATCH] cleanup --- .gitlab-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2abc3b9..0df0efa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,15 +86,8 @@ 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