Commit 3ea550f9 authored by Lorenzo Faletra's avatar Lorenzo Faletra

clean merge conflicts

parent 1f033625
......@@ -125,14 +125,4 @@
</ul>
</div>
</div>
<<<<<<< HEAD
<<<<<<< HEAD
</nav>';
?>
=======
</nav>
>>>>>>> dev
=======
</nav>
>>>>>>> dev
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