Permalink
Browse files

fixed merge conflicts

  • Loading branch information...
2 parents 4647204 + b23282f commit b79819ad544193e50f8099fdd0ab36a692c45435 @hay committed Mar 16, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −2 README.md
  2. +1 −1 index.html
View
@@ -3,5 +3,4 @@
Full documentation available here:
-[http://hay.github.com/stapes/](http://hay.github.com/stapes/)
-
+[http://hay.github.com/stapes/](http://hay.github.com/stapes/)
View
@@ -76,7 +76,6 @@ <h3 id="m-phil">Philosophy</h3>
<li><a href="#m-plugins">A simple mechanism</a> for writing plugins and extensions to extend the functionality of Stapes.</li>
<li>Nice extensive documentation with lots of examples (you're reading that right now ;)</li>
<li>Optimized to use Ecmascript 5 features when they're available in the browser.</li>
- <li>Compatible with IE6+, Chrome, Firefox, Safari, Opera, Android and iOS browsers</li>
</ul>
<p><em>But what about templating, persistence, routing, history management, etc?</em></p>
@@ -234,6 +233,7 @@ <h3 id="m-general">General methods</h3>
<h1>extend</h1>
<h2>module.extend([context, ]object)</h2>
+
<h2>Stapes.extend( object )</h2>
<p>Extend your module by giving an

0 comments on commit b79819a

Please sign in to comment.