From 7974b55ddfc5f2da1a1b44b9ed05d3119a97af4d Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@gmail.com>
Date: Fri, 15 Nov 2019 23:33:56 -0500
Subject: [PATCH] merge

---
 etc/otp.dc  | 1 +
 etc/toon.dc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/otp.dc b/etc/otp.dc
index 78b0c84..d346ef3 100755
--- a/etc/otp.dc
+++ b/etc/otp.dc
@@ -543,3 +543,4 @@ dclass AstronLoginManager : DistributedObject {
   acknowledgeAvatarName(uint32) clsend;
   acknowledgeAvatarNameResponse();
 };
+
diff --git a/etc/toon.dc b/etc/toon.dc
index 0f74750..2fbafad 100755
--- a/etc/toon.dc
+++ b/etc/toon.dc
@@ -3269,3 +3269,4 @@ dclass DistributedTrashcanZeroMgr : DistributedPhaseEventMgr {
 
 dclass DistributedSillyMeterMgr : DistributedPhaseEventMgr {
 };
+