diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
| commit | 5e60392c273f0c9c5efa765a05414c618381780a (patch) | |
| tree | d1eedbb1dfa86e66532a6d8746b7a81e5a444d3a /scripts/messages/message_template.msg.sha1 | |
| parent | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (diff) | |
| parent | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (diff) | |
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'scripts/messages/message_template.msg.sha1')
| -rwxr-xr-x | scripts/messages/message_template.msg.sha1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index 47291dcd66..941bb8e8c1 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1,5 @@ +<<<<<<< HEAD dd15c52581b3fe99e072b26872deba2560893fc4 +======= +d7915d67467e59287857630bd89bf9529d065199 +>>>>>>> 100ebbab2437de7f5d124a0d7b8279a7a7b57656 |