From 164d300c2d4d88f2bd787a0c56dc34b3ebb47073 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Sat, 10 May 2008 11:09:02 +0200
Subject: Resolve some merge conflicts.

---
 inotail.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'inotail.h')

diff --git a/inotail.h b/inotail.h
index ea680cb..4c1ca4d 100644
--- a/inotail.h
+++ b/inotail.h
@@ -12,12 +12,11 @@
 
 #define DEFAULT_N_LINES 10	/* Number of items to tail. */
 
-#define DEFAULT_BUFFER_SIZE 4096
 /* inotify event buffer length for one file */
 #define INOTIFY_BUFLEN (4 * sizeof(struct inotify_event))
 
 /* tail modes */
-typedef enum { M_LINES, M_BYTES } mode_t;
+enum tail_mode { M_LINES, M_BYTES };
 
 /* Every tailed file is represented as a file_struct */
 struct file_struct {
-- 
cgit v1.2.3-54-g00ecf