diff options
Diffstat (limited to 'scripts/messages')
| -rwxr-xr-x | scripts/messages/message_template.msg.sha1 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index efa5f3cf48..941bb8e8c1 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1,5 @@ -d7915d67467e59287857630bd89bf9529d065199
\ No newline at end of file +<<<<<<< HEAD +dd15c52581b3fe99e072b26872deba2560893fc4 +======= +d7915d67467e59287857630bd89bf9529d065199 +>>>>>>> 100ebbab2437de7f5d124a0d7b8279a7a7b57656 |