Skip to content

Commit

Permalink
Merge conflict fixes must be saved, then committed
Browse files Browse the repository at this point in the history
  • Loading branch information
blinkdog committed Jan 20, 2024
1 parent bd2a674 commit 2669e92
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,20 +321,12 @@ GLOBAL_VAR(restart_counter)

s += "<b>[station_name()]</b>";
s += " ("
<<<<<<< HEAD
s += "<a href=\"[CONFIG_GET(string/discordurl)]\">" //Change this to wherever you want the hub to link to.
=======
s += "<a href=\"[discord_url]\">" //Change this to wherever you want the hub to link to.
>>>>>>> upstream/master
s += "Discord" //Replace this with something else. Or ever better, delete it and uncomment the game version.
s += "</a>"
s += ")"
s += " ("
<<<<<<< HEAD
s += "<a href=\"[CONFIG_GET(string/githuburl)]\">"
=======
s += "<a href=\"[github_url]\">"
>>>>>>> upstream/master
s += "Github"
s += "</a>"
s += ")"
Expand Down

0 comments on commit 2669e92

Please sign in to comment.