summaryrefslogtreecommitdiff
path: root/scripts/messages/message_template.msg.sha1
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/messages/message_template.msg.sha1')
-rwxr-xr-xscripts/messages/message_template.msg.sha14
1 files changed, 0 insertions, 4 deletions
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