conflict fix

ylecuyer · Aug 9, 2024 · 09187b7 · 09187b7
1 parent a575ebf
commit 09187b7
Show file tree

Hide file tree

Showing 13 changed files with 729 additions and 75 deletions.
diff --git a/demo/index.ts.orig b/demo/index.ts.orig
diff --git a/docs/index.10c89ae2.js.map b/docs/index.10c89ae2.js.map
diff --git a/docs/index.10c89ae2.js → docs/index.9ddd6c6e.js b/docs/index.10c89ae2.js → docs/index.9ddd6c6e.js
diff --git a/docs/index.9ddd6c6e.js.map b/docs/index.9ddd6c6e.js.map
diff --git a/docs/index.c3df483d.js b/docs/index.c3df483d.js
diff --git a/docs/index.c3df483d.js.map b/docs/index.c3df483d.js.map
diff --git a/docs/index.html b/docs/index.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-<!doctype html><html><head><script type="module" src="index.ff75d985.js"></script><link rel="stylesheet" href="index.f01e0bc4.css"><script type="module" src="index.runtime.bc92bf94.js"></script><link rel="icon shortcut" href="favicon.4a73512e.png"><title>RingCentral WebPhone Demo</title></head><body> <div class="container"> <h1>RingCentral WebPhone Demo</h1> <div id="app"></div> </div> <video id="remoteVideo" hidden></video> <video id="localVideo" hidden muted></video> <script type="text/html" id="template-incoming">
-=======
-<!doctype html><html><head><script type="module" src="index.ff75d985.js"></script><link rel="stylesheet" href="index.f01e0bc4.css"><script type="module" src="index.runtime.0c1ff1a0.js"></script><link rel="icon shortcut" href="favicon.4a73512e.png"><title>RingCentral WebPhone Demo</title></head><body> <div class="container"> <h1>RingCentral WebPhone Demo</h1> <div id="app"></div> </div> <video id="remoteVideo" hidden></video> <video id="localVideo" hidden muted></video> <script type="text/html" id="template-incoming">
->>>>>>> upstream/1.x
+<!doctype html><html><head><script type="module" src="index.ff75d985.js"></script><link rel="stylesheet" href="index.f01e0bc4.css"><script type="module" src="index.runtime.da1d749b.js"></script><link rel="icon shortcut" href="favicon.4a73512e.png"><title>RingCentral WebPhone Demo</title></head><body> <div class="container"> <h1>RingCentral WebPhone Demo</h1> <div id="app"></div> </div> <video id="remoteVideo" hidden></video> <video id="localVideo" hidden muted></video> <script type="text/html" id="template-incoming">
       <div class="modal fade" tabindex="-1" role="dialog">
         <div class="modal-dialog">
           <div class="modal-content">
@@ -183,8 +179,4 @@ <h4 class="modal-title">
           </div>
         </div>
       </div>
-<<<<<<< HEAD
-    </script> <script type="module" src="index.10c89ae2.js"></script> </body></html>
-=======
-    </script> <script type="module" src="index.c3df483d.js"></script> </body></html>
->>>>>>> upstream/1.x
+    </script> <script type="module" src="index.9ddd6c6e.js"></script> </body></html>
diff --git a/docs/index.runtime.0c1ff1a0.js b/docs/index.runtime.0c1ff1a0.js
diff --git a/docs/index.runtime.0c1ff1a0.js.map b/docs/index.runtime.0c1ff1a0.js.map
diff --git a/docs/index.runtime.bc92bf94.js b/docs/index.runtime.bc92bf94.js