From 0ae8bbaf5d85b065354dcc010d08a4a2e759f867 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 6 Sep 2023 15:28:02 -0700 Subject: Checkpoint WebRTC Voice --- scripts/messages/message_template.msg.sha1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/messages') diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index 5ad85458e9..47291dcd66 100755 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -e3bd0529a647d938ab6d48f26d21dd52c07ebc6e \ No newline at end of file +dd15c52581b3fe99e072b26872deba2560893fc4 -- cgit v1.2.3 From a52391d582ec7299273d3ff38efdb2455da7700e Mon Sep 17 00:00:00 2001 From: Brad Linden 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') 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