nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert changes

Browse source
This commit is contained in:
Nick van der Burgt 2010-12-29 16:06:06 +01:00
parent 8bbb142c85
commit c45fa2d402
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/javascripts/ie.js
View file

@ -1,3 +1,8 @@
<<<<<<< HEAD
var elements = new Array('header','footer','article','nav','section'); var elements = new Array('header','footer','article','nav','section');
for(var element in elements) { document.createElement(elements[element]); } for(var element in elements) { document.createElement(elements[element]); }
=======
document.createElement('header');
document.createElement('footer');
>>>>>>> parent of 2e9aab1... Added some more HTML5 elements so no suprises in the future