summaryrefslogtreecommitdiffstats
path: root/watchquagga/watchquagga.c
diff options
context:
space:
mode:
Diffstat (limited to 'watchquagga/watchquagga.c')
-rw-r--r--watchquagga/watchquagga.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index 4f7855ab..f4c483cf 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,9 +1,5 @@
/*
-<<<<<<< HEAD:watchquagga/watchquagga.c
- $Id: watchquagga.c,v 1.12 2007/05/10 02:38:52 paul Exp $
-=======
$Id$
->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:watchquagga/watchquagga.c
Monitor status of quagga daemons and restart if necessary.