From 6694d32bc380f331f29b82c42dfb3da738e487d6 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 19 Sep 2021 16:49:18 +0200
Subject: [PATCH] Fixes some mispathed markdown links in the
 readme/contribution file (#8260)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
---
 .github/CONTRIBUTING.md | 2 +-
 README.md               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 39bec78056e..258d8fd5c0b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -104,7 +104,7 @@ Things you **CAN'T** do:
 
 [Policy configuration system](./guides/POLICYCONFIG.md)
 
-[Hard deletes](./guides/HARDDEL.md)
+[Hard deletes](./guides/HARDDELETES.md)
 
 [UI Development](../tgui/README.md)
 
diff --git a/README.md b/README.md
index fe8049dc543..f9fe4419463 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,11 @@ On **2021-01-04** we have changed the way to compile the codebase.
 
 Find `BUILD.bat` here in the root folder of tgstation, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile.
 
+<<<<<<< HEAD
 After it finishes, you can then [setup the server](.github/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
+=======
+**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
+>>>>>>> 28ba8ee9a08 (Fixes some mispathed markdown links in the readme/contribution file (#61494))
 
 **Building tgstation in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.