Fix conflicts in index.html
authorNeal Nelson <neal@makalumedia.com>
Thu, 10 Feb 2011 10:26:48 +0000 (11:26 +0100)
committerNeal Nelson <neal@makalumedia.com>
Thu, 10 Feb 2011 10:26:48 +0000 (11:26 +0100)
commit5b469bb6ff179607a51c6ce637ab3ee921d594b6
tree0e8cad8ee3edc3fe58ddaeedd65424b437b5c3c3
parent995b9973b84f282f4c54426e888834617c3cc1f4
Fix conflicts in index.html
docs/index.html