Update index.html

muk_web_client/static/description/index.html

@@ -7,11 +7,7 @@
 	</div>
 </section>
 
-<<<<<<< HEAD
 <section class="oe_container" style="padding-bottom: 50px;">
-=======
-<section class="oe_container" style="padding-bottom: 60px;">
->>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 	<div class="oe_row oe_spaced">
 		<div class="oe_picture">
 			<h3 class="oe_slogan">Overview</h3>
@@ -20,14 +16,8 @@
 				notifications. To add a channel listener to the client just
 				extend the web client and declare a new bus channel.
 			</p>
-<<<<<<< HEAD
 			<pre>
 		    	<code>
-=======
-			<p>
-			    <pre>
-			        <code>
->>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 var WebClient = require('web.WebClient');
 var session = require('web.session');	
 
@@ -41,14 +31,8 @@ WebClient.include({
 		...
 	}
 });
-<<<<<<< HEAD
 		    	</code>
 			</pre>
-=======
-			        </code>
-			    </pre>
-			</p>
->>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 		</div>
 	</div>
 </section>