Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed conflicts

  • Loading branch information...
commit 40a7e450db05403eca3cbec7ef615acd4141ed40 1 parent a59ec71
@estelle authored
Showing with 0 additions and 7 deletions.
  1. +0 −7 index.html
View
7 index.html
@@ -438,22 +438,15 @@
</div>
<div class="slide intro">
-<<<<<<< HEAD
-<header><h1> Messaging APIs</h1></header>
-=======
<header><h1> Web Sockets</h1></header>
->>>>>>> master
<h1><a href="workers.html">Go ➹</a></h1>
</div>
<div class="slide intro">
-<<<<<<< HEAD
-=======
<header><h1> Other JS APIs</h1></header>
->>>>>>> master
<header><h1> Web Sockets</h1></header>
<h1><a href="workers.html">Go ➹</a></h1>
Please sign in to comment.
Something went wrong with that request. Please try again.