From e2b62f857d5e47a62de0bf73a2571ff1dccad4e1 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Thu, 28 Mar 2019 21:49:05 -0400
Subject: [PATCH] Conflict Resolution

---
 html/changelog.html                | 8 ++++----
 html/changelogs/.all_changelog.yml | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index a4353e43182..757677d2ccc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -282,7 +282,7 @@
 			</ul>
 			<h3 class="author">Mechoid updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">Hallucinations are no longer only Pun Pun.</li>
+				<li class="rsctweak">Hallucinations are no longer only Pun Pun.</li>
 			</ul>
 			<h3 class="author">Neerti updated:</h3>
 			<ul class="changes bgimages16">
@@ -384,8 +384,8 @@
 			</ul>
 			<h3 class="author">Mechoid updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">Promethean limbs store more damage.</li>
-				<li class="tweak">Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage.</li>
+				<li class="rsctweak">Promethean limbs store more damage.</li>
+				<li class="rsctweak">Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage.</li>
 				<li class="rscadd">Limbs can now spread their damage to neighbors with the spread_dam var, when reaching max damage.</li>
 			</ul>
 			<h3 class="author">PrismaticGynoid updated:</h3>
@@ -519,7 +519,7 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Broken APCs can be bashed open with slightly smaller objects now. This means wrenches are acceptable, no need to hunt down a fire extinguisher.</li>
 				<li class="rscdel">EVA rigsuit/hardsuit no longer holds toolboxes in suit storage since those have been a volume inventory for some time now. RIP ghetto satchel.</li>
-				<li class="tweak">CE's rigsuit/hardsuit no longer holds pickaxes and ore satchels, but can now hold inflateables.</li>
+				<li class="rsctweak">CE's rigsuit/hardsuit no longer holds pickaxes and ore satchels, but can now hold inflateables.</li>
 				<li class="bugfix">Retracting rigsuit/hardsuit helmets with no valid mask equipped now disables internals.</li>
 				<li class="bugfix">Offline rigsuits/hardsuits are no longer considered valid air supplies by the internals button. Before, your internals would instantly shut off before you could get a breath out of the rigsuit. Now, the internals button will look for a different tank instead.</li>
 				<li class="rscadd">Tajaran now get to keep their tails when they wear the EVA, RD, or Industrial rigsuits/hardsuits. Unathi sprites to come soon!</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 59813af11d5..bfbd578cc37 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4228,8 +4228,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds two rig suits. Military Rig suit from Bay and PMC rigsuit
   - rscadd: Adds four exploration and pilot voidsuits (alternate sprites by Naidh)
   - rscadd: Adds exploration and pilot voidsuits
-<<<<<<< HEAD
-=======
 2018-10-13:
   Anewbe:
   - bugfix: You can no longer have ALL of your blood punched out.
@@ -4303,9 +4301,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       circuit reference scanning. Antag multi-tools untouched for now.
   - bugfix: Integrated circuit printer now respects adjacency, if it is not set to
       debug.
-<<<<<<< HEAD
->>>>>>> 8430fe5... Merge pull request #5768 from Atermonera/changelog
-=======
 2019-01-06:
   Mechoid:
   - bugfix: Slimes now respect slime colors as their faction when dealing with other
@@ -4419,4 +4414,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   kartagrafi:
   - rscadd: 'Adds several clothing items to loadout such as: Nock masks, cowls and
       robes.'
->>>>>>> 1c7ceeb... Merge pull request #5989 from Atermonera/changelog