Some stupid comment

This commit is contained in:
Guillaume DE LA RUE 2011-02-12 01:09:02 +01:00
parent 64639a7834
commit 6dc7a5485e

View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
<!doctype html>
<html>
<head>
@ -13,6 +12,3 @@
<script type="text/javascript" src="js/wyrian.js"></script>
</body>
</html>
=======
blbabnlazblk
>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d