Resolve some merge conflicts.

1 files changed, 2 insertions, 2 deletions

diff --git a/inotail.c b/inotail.c
index 4195e13..d708f1f 100644
--- a/inotail.c
+++ b/inotail.c
@@ -57,7 +57,7 @@ static const struct option long_opts[] = {
 	{ NULL, 0, NULL, 0 }
 };
 
-static void *emalloc(size_t size)
+static void *emalloc(const size_t size)
 {
 	void *ret = malloc(size);
 
@@ -698,7 +698,7 @@ int main(int argc, char **argv)
 	int i, c, ret = 0;
 	int n_files;
 	unsigned long n_units = DEFAULT_N_LINES;
-	mode_t mode = M_LINES;
+	char mode = M_LINES;
 	char forever = 0;
 	char **filenames;
 	struct file_struct *files = NULL;