Fixed incomplete merge in message_template.msg.sha1

2024-06-20 14:40:14 -07:00 · 2024-06-20 14:40:14 -07:00 · a52391d582
parent d8cbc8a0fd
commit a52391d582
1 changed files with 0 additions and 4 deletions
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@ -1,5 +1 @@
-<<<<<<< HEAD
-dd15c52581b3fe99e072b26872deba2560893fc4
-=======
 d7915d67467e59287857630bd89bf9529d065199
->>>>>>> 100ebbab2437de7f5d124a0d7b8279a7a7b57656