reconcile merge conflict in package.json

formsy · Dec 2, 2015 · 4b7bd99 · 4b7bd99
2 parents 300c88b + 5374796
commit 4b7bd99
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ const Form = React.createClass({
 
   getInitialState: function () {
     return {
-      canSumbit: false
+      canSubmit: false
     };
   },
 
@@ -175,4 +175,4 @@ See [CHANGELOG.md](https://github.com/mbrookes/formsy-material-ui/blob/master/CH
 
 Originally based on an example by [Ryan Blakeley](https://github.com/rblakeley).
 
-Thanks to our [contributors](https://github.com/mbrookes/formsy-material-ui/graphs/contributors).
+Thanks to our [contributors](https://github.com/mbrookes/formsy-material-ui/graphs/contributors).