From a52391d582ec7299273d3ff38efdb2455da7700e Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 20 Jun 2024 14:40:14 -0700
Subject: Fixed incomplete merge in message_template.msg.sha1

---
 scripts/messages/message_template.msg.sha1 | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'scripts/messages/message_template.msg.sha1')

diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 941bb8e8c1..9d5517ab68 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1,5 +1 @@
-<<<<<<< HEAD
-dd15c52581b3fe99e072b26872deba2560893fc4
-=======
 d7915d67467e59287857630bd89bf9529d065199
->>>>>>> 100ebbab2437de7f5d124a0d7b8279a7a7b57656
-- 
cgit v1.2.3