Fix conflict bash.

1 files changed, 2 insertions, 2 deletions

diff --git a/haskell.html.markdown b/haskell.html.markdown
index e3ec3f38..267b40af 100644
--- a/haskell.html.markdown
+++ b/haskell.html.markdown
@@ -11,7 +11,7 @@ makes coding a real joy for me.
 ```haskell
 -- Single line comments start with two dashes.
 {- Multiline comments can be enclosed
-en a block like this.
+in a block like this.
 -}
 
 ----------------------------------------------------
@@ -329,7 +329,7 @@ main' = interact countLines
 sayHello :: IO ()
 sayHello = do 
    putStrLn "What is your name?"
-   name <- getLine -- this gets a line and gives it the name "input"
+   name <- getLine -- this gets a line and gives it the name "name"
    putStrLn $ "Hello, " ++ name
    
 -- Exercise: write your own version of `interact` that only reads