From 398d8cc9c4c4e553935cc4cee125e0cb12a94a0f Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 31 Jan 2021 00:50:04 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 642e8ba155..30bf775e19 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-
+  
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-
-  </script>
+	
+  </script>  
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -42,11 +42,11 @@
 </table>
 
 		<!--
-
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
-
+		
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
+		
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-
+		
 		-->
 		<div class="commit sansserif">
 
@@ -157,7 +157,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">The drop circuit can no longer drop things that are not inside it.</li>
 			</ul>
-			<h2 class="date">27 January 2021</h2>
 			<h3 class="author">raspy-on-osu updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">bespoke ventcrawling element not detaching due to malformed call</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d5e2b1be4c..3d2937bf1f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28361,6 +28361,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-01-31:
   Putnam3145:
   - balance: fermichem explosion EMPs don't cover the entire station
+<<<<<<< HEAD
 2021-02-02:
   silicons:
   - rscadd: pais can now be carried around piggybacking/fireman
@@ -28370,3 +28371,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The green energy sabre's sprite now respects proper handedness.
 =======
 >>>>>>> 5ad3b97dc1... yesss?
+=======
+>>>>>>> 80a0033e5f... Automatic changelog compile [ci skip]