1 files changed, 4 insertions, 1 deletions
diff --git a/main.c b/main.c
index ee98903..8561f26 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,10 @@
 
 /* 
 TODO:
+<<<<<<< HEAD
+=======
 no foreign parameter declarations
+>>>>>>> 3fa3c17a12cb52edbcc9890cad59d610e0360f90
 see NOTE in test.toc
 variadic fns
 #include
@@ -86,7 +89,7 @@ int main(int argc, char **argv) {
 	}
 	++contents;
 	if (ferror(in)) {
-		fprintf(stderr, "Error reading input file: %s.\n", argv[1]);
+		fprintf(stderr, "Error reading input file: %s.\n", in_filename);
 		return EXIT_FAILURE;
 	}
 	fclose(in);