fix merge

miladz68 · Oct 24, 2016 · a02b21d · a02b21d
2 parents 0501080 + d7f50be
commit a02b21d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/share/files.txt b/share/files.txt
@@ -1,3 +1,3 @@
-a.txt
-b.txt
-c.txt
+share/a.txt
+share/b.txt
+share/c.txt
diff --git a/src/Course/FileIO.hs b/src/Course/FileIO.hs
@@ -46,14 +46,26 @@ And b.txt, containing:
 And c.txt, containing:
   the contents of c
 
-$ runhaskell FileIO.hs "files.txt"
-============ a.txt
+To test this module, load ghci in the root of the project directory, and do
+    >> :main "share/files.txt"
+
+Example output:
+
+$ ghci
+GHCi, version ... 
+Loading package...
+Loading ...
+[ 1 of 28] Compiling (etc...
+...
+Ok, modules loaded: Course, etc...
+>> :main "share/files.txt"
+============ share/a.txt
 the contents of a
 
-============ b.txt
+============ share/b.txt
 the contents of b
 
-============ c.txt
+============ share/c.txt
 the contents of c
 
 -}