From 78c8fd34a58cd3c0c2572a3318bb47a3d6942d33 Mon Sep 17 00:00:00 2001
From: SilverNexus <a_daniel.hawkins@yahoo.com>
Date: Mon, 12 Oct 2020 19:39:41 -0400
Subject: [PATCH] Add ChangeLog entry for conversion to patches over manual
 reconciliation.

---
 ChangeLog.rtro | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog.rtro b/ChangeLog.rtro
index f09f9ea..d6a024a 100644
--- a/ChangeLog.rtro
+++ b/ChangeLog.rtro
@@ -1,3 +1,7 @@
+2020-10-12 Daniel Hawkins
+	* image_info.patch,
+	  Makefile.server.lib.am.patch: Convert the files that needed to merge with existing files into patches.
+
 2020-10-06 Daniel Hawkins
 	* construct/town/l_shop1.rtro.x11.png: New art to give a frontal view.