From 3a28bf3cf89b36ec264c7df357b74af853118ec1 Mon Sep 17 00:00:00 2001 From: Myk Taylor <myk002@yahoo.com> Date: Fri, 29 Nov 2024 23:12:23 -0800 Subject: [PATCH] fix merge error --- .github/workflows/generate-symbols.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml index a0fed46964..1fce823ced 100644 --- a/.github/workflows/generate-symbols.yml +++ b/.github/workflows/generate-symbols.yml @@ -351,11 +351,7 @@ jobs: +login $STEAM_USERNAME \ "+app_update 975370 $BETA_PARAMS validate" \ +quit -<<<<<<< HEAD - tar xjf ../dfhack-symbols-windows64-build.tar.bz2 -C DF_steam -======= tar xjf dfhack-symbols-windows64-build.tar.bz2 -C DF_steam ->>>>>>> develop cp xml/symbols.xml DF_steam/hack cd DF_steam "Dwarf Fortress.exe" &