fix mergeconflict

This commit is contained in:
tchncs
2018-11-29 12:38:43 +01:00
4 changed files with 6 additions and 5 deletions

View File

@@ -60,6 +60,7 @@ function random_messages.read_messages()
mc(base, "# Illuna-Notes: ")..mc(highlight, "Illuna is powered by donations! ")..mc(base,"You can help us paying the bills at ")..mc(url,"https://illuna.rocks/donate")..mc(base,". Each tiny donation helps a bunch! And as a ")..mc(highlight, "*thank you*")..mc(base, " you'll get some Donorcoins for your donation. <3"),
mc(base, "# Illuna-Notes: Confused about the new, final spawnpoint? You can always go back to the old one with the ")..mc(highlight, "/spawn2")..mc(base," command")..mc(base, "."),
mc(base, "# Illuna-Notes: If you use ")..mc(highlight, "Pipeworks")..mc(base, ", please try to make as short pipes as possible using")..mc(highlight, " teleportation tubes")..mc(base, "."),
mc(base, "On your way to the travelcenter? Why not give the")..mc(highlight, " postoffice")..mc(base, "a visit too? it's just nearby and awaiting your beautiful/personal mailbox!"),
}
end