From dd083ae97ce6d1894e7d74362fb3ea1d86c3fd15 Mon Sep 17 00:00:00 2001
From: VitrescentTortoise <max.blackllama@gmail.com>
Date: Sun, 26 May 2013 19:30:49 -0700
Subject: [PATCH] Fixing changelog.

---
 html/changelog.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 01fee615d04..a0872df444b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,8 +57,9 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
 
-<<<<<<< HEAD
-<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+
+
 <div class='commit sansserif'>
 	<h2 class='date'>26th May 2013</h2>
 	<h3 class='author'>Chinsky updated:</h3>
@@ -94,7 +95,6 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class="rscadd">Added lock down buttons to the wardens office. </li>
 		<li class="rscadd">The randomized barsign has made a return. </li>
 		<li class="rscadd">Syndicate Agent ID's external airlock access restored.</li>
->>>>>>> bleeding-edge-freeze
 	</ul>
 </div>