Merge remote-tracking branch 'origin/master'

datalink · Feb 1, 2012 · 0d38518 · 0d38518
2 parents bf70ffd + 8ac3224
commit 0d38518
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/backbone.memento.js b/backbone.memento.js
@@ -1,9 +1,9 @@
 // Backbone.Memento v0.4.1a
 //
 // Copyright (C)2011 Derick Bailey, Muted Solutions, LLC
-// Distributed Under MIT Liscene
+// Distributed Under MIT License
 //
-// Documentation and Full Licence Availabe at:
+// Documentation and Full License Available at:
 // http://github.com/derickbailey/backbone.memento
 
 Backbone.Memento = (function(Backbone, _){

diff --git a/readme.md b/readme.md
@@ -123,7 +123,6 @@ changed.
 
 ### memento.restart (formerly reset)
 
-:wa
 This method effectively rolls your structure back to the first store point, no matter how
 many times it has been stored in the memento.
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,7 +123,6 @@ changed. @@
     ### memento.restart (formerly reset)
-    :wa
     This method effectively rolls your structure back to the first store point, no matter how
     many times it has been stored in the memento.
@@ Expand Down @@