Merge branch 'master' of github.com:glenux/wyrian

Conflicts: index.html
2011-02-12 01:06:30 +01:00 · 2011-02-12 01:06:30 +01:00 · 48273cccbe
commit 48273cccbe
parent 9797d72815 8c9ce0771b
1 changed files with 4 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -12,3 +12,6 @@
 <script type="text/javascript" src="js/wyrian.js"></script>
 </body>
 </html>
+=======
+blbabnlazblk
+>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d