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

Conflicts: index.html test
2011-02-12 01:07:46 +01:00 · 2011-02-12 01:07:46 +01:00 · 64639a7834
parent 48273cccbe
commit 64639a7834
1 changed files with 1 additions and 0 deletions
--- a/index.html
+++ b/index.html
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!doctype html>
 <html>
 <head>