Commit 8fce26f2 authored by Okhin's avatar Okhin

Fixing the part about PRISM that was broken

parent 18cfd56e
......@@ -92,8 +92,6 @@
</div>
<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#collapse1" aria-expanded="false" aria-controls="collapse1">Continuer&nbsp;&#9660;</button>
</div>
<button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#collapse1" aria-expanded="false" aria-controls="collapse1">Continuer&nbsp;&#9660;</button>
</div>
<div class="pageSection">
<h2> PRISM nous prouve que nos libertés sont en danger </h2>
<p> Durant l'été 2013, Edward Snowden a révélé l'existence du programme PRISM, mené par la NSA.</p>
......@@ -216,8 +214,7 @@
<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#collapse6" aria-expanded="false" aria-controls="#collapse6">Continuer &#9660;</button>
</div>
<<<<<<< HEAD
<div class="pageSection contanier-fluid" id="tableau">
<div class="pageSection container-fluid" id="tableau">
<div class="row">
<h2>Quels sont les enjeux du futur règlement&nbsp;?</h2>
<p>Cliquez sur une case pour en apprendre plus</p><br/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment