glenux/wyrian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some stupid comment

Browse source
This commit is contained in:
Guillaume DE LA RUE 2011-02-12 01:09:02 +01:00
parent 64639a7834
commit 6dc7a5485e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

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