summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-09 11:35:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-09 11:35:30 -0400
commit5a3a7f5d65dd1be41375b147a7ed51dbc4e2bf1d (patch)
tree9ec218e4c6a069057b7f048f8a7cee54f3e4b2f6
parentd8d9d12051e3a0bae7843fb0e80361a54ab528eb (diff)
parent76668ed1a8326e8222cdf5adf171751473b76759 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/design/assistant/blog/day_258__beginning_of_the_end.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/blog/day_258__beginning_of_the_end.mdwn b/doc/design/assistant/blog/day_258__beginning_of_the_end.mdwn
index 761da9ecf..e2e544399 100644
--- a/doc/design/assistant/blog/day_258__beginning_of_the_end.mdwn
+++ b/doc/design/assistant/blog/day_258__beginning_of_the_end.mdwn
@@ -12,7 +12,7 @@ It's identical, except it runs Windows.
I installed the Haskell Platform for Windows on it, and removed
some of the bloatware to free up disk space and memory for development.
-While a rather disgusting experience, I certianly have a usable Haskell
+While a rather disgusting experience, I certainly have a usable Haskell
development environment on this OS a lot faster than I did on Android!
Cabal is happily installing some stuff, and other stuff wants me to install
Cygwin.