From c45fa2d402abc1b7fb36756fab06f9bfd3df623b Mon Sep 17 00:00:00 2001
From: Nick van der Burgt <nickvanderburgt@gmail.com>
Date: Wed, 29 Dec 2010 16:06:06 +0100
Subject: [PATCH] Revert changes

---
 public/javascripts/ie.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/ie.js b/public/javascripts/ie.js
index 330c8be04..8f2976a79 100644
--- a/public/javascripts/ie.js
+++ b/public/javascripts/ie.js
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 var elements = new Array('header','footer','article','nav','section');
 
-for(var element in elements) { document.createElement(elements[element]); }
\ No newline at end of file
+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