Permalink
Browse files

Merge branch 'master' of https://github.com/murtaugh/HTML5-Reset-Word…

…press-Theme

Conflicts:
	readme.md
  • Loading branch information...
murtaugh committed Apr 12, 2011
2 parents f1e0cec + 3633ef1 commit 2e7cd20a7afb82e16648eb899d427f6265dd503c
Showing with 9 additions and 1 deletion.
  1. +9 −1 readme.md
View
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
# HTML5 Reset Wordpress Theme (http://html5reset.org)
## Summary:
The HTML5 Reset Wordpress theme is a blank theme based on the [https://github.com/murtaugh/HTML5-Reset](HTML5 Reset templates).
+=======
+# HTML5 Reset Wordpress Theme [http://html5reset.org](http://html5reset.org)
+
+## Summary:
+
+The HTML5 Reset Wordpress theme is a blank theme based on the [https://github.com/murtaugh/HTML5-Reset]HTML5 Reset templates.
+>>>>>>> 3633ef1e92d64db5d1753db222dc227b851af369
1. A style sheet designed to strip initial files from browsers, meaning you start off with a blank slate.
2. Easy to customize -- remove whatever you don't need, keep what you do.
@@ -11,4 +19,4 @@ The HTML5 Reset Wordpress theme is a blank theme based on the [https://github.co
5. Empty mobile and print style sheets, including blocks for device orientation
6. Modernizr.js [http://www.modernizr.com/](http://www.modernizr.com/) enables HTML5 compatibility with IE (and a dozen other great features)
7. IE-specific classes for simple CSS-targeting
-8. iPhone/iPad/iTouch icon snippets
+8. iPhone/iPad/iTouch icon snippets

0 comments on commit 2e7cd20

Please sign in to comment.