Fix merge conflict at index.html

Author: ryukinix

index.html

@@ -254,21 +254,12 @@ <h3 id="sec-1-2"><span class="section-number-3">1.2</span> O que é Common Lisp?
 
 <div class="org-src-container">
 
-<<<<<<< HEAD
-<pre class="src src-lisp"><span style="color: #51afef;">(</span><span style="color: #51afef;">defun</span> <span style="color: #c678dd;">hello-world</span> <span style="color: #c678dd;">()</span> <span style="color: #525252;">;; </span><span style="color: #525252;">defini&#231;&#227;o de fun&#231;&#227;o</span>
-  <span style="color: #c678dd;">(</span>princ <span style="color: #99bb66;">"Hello, Lispers!"</span><span style="color: #c678dd;">)</span><span style="color: #51afef;">)</span>
-
-<span style="color: #51afef;">(</span>hello-world<span style="color: #51afef;">)</span> <span style="color: #525252;">;; </span><span style="color: #525252;">chamada de fun&#231;&#227;o</span>
-
-<span style="color: #525252;">;; </span><span style="color: #525252;">resultado: Hello, Lispers!</span>
-=======
 <pre class="src src-lisp"><span style="color: #51afef;">(</span><span style="color: #51afef;">defun</span> <span style="color: #5cEfFF;">hello-world</span> <span style="color: #C57BDB;">()</span> <span style="color: #62686E;">;; </span><span style="color: #62686E;">defini&#231;&#227;o de fun&#231;&#227;o</span>
   <span style="color: #C57BDB;">(</span>princ <span style="color: #7bc275;">"Hello, Lispers!"</span><span style="color: #C57BDB;">)</span><span style="color: #51afef;">)</span>
 
 <span style="color: #51afef;">(</span>hello-world<span style="color: #51afef;">)</span> <span style="color: #62686E;">;; </span><span style="color: #62686E;">chamada de fun&#231;&#227;o</span>
 
 <span style="color: #62686E;">;; </span><span style="color: #62686E;">resultado: Hello, Lispers!</span>
->>>>>>> Compile index.html
 </pre>
 </div>
 </div>