fix merge error

DFHack · Nov 30, 2024 · 3a28bf3 · 3a28bf3
1 parent 4c222f2
commit 3a28bf3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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" &