Merge branch 'emphstack'

Conflicts:
	Makefile
	js/lib/inlines.js

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index 76a0e12..99d14f8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 			printf(" - CommonMark converter (c) 2014 John MacFarlane\n");
 			exit(0);
 		} else if ((strcmp(argv[i], "--help") == 0) ||
-				(strcmp(argv[i], "-h") == 0)) {
+			   (strcmp(argv[i], "-h") == 0)) {
 			print_usage();
 			exit(0);
 		} else if (strcmp(argv[i], "--ast") == 0) {
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
 			if (fp == NULL) {
 				fprintf(stderr, "Error opening file %s: %s\n",
-						argv[files[i]], strerror(errno));
+					argv[files[i]], strerror(errno));
 				exit(1);
 			}
 
@@ -74,4 +74,3 @@ int main(int argc, char *argv[])
 
 	return 0;
 }
-