From f6f2b7ff53421aa490b8c1b85b5e5d790bdc4ede Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Thu, 18 Jun 2009 09:40:36 -0600
Subject: [PATCH] oops, missed this one in the merge!

---
 restore/restore.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/restore/restore.h b/restore/restore.h
index 459814d..51a3082 100644
--- a/restore/restore.h
+++ b/restore/restore.h
@@ -5,11 +5,7 @@
  *	Stelian Pop <stelian@popies.net>, 1999-2000
  *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
-<<<<<<< HEAD:restore/restore.h
- *	$Id: restore.h,v 1.33 2005/07/07 09:16:08 stelian Exp $
-=======
  *	$Id: restore.h,v 1.34 2007/02/22 20:12:50 stelian Exp $
->>>>>>> upstream/0.4b42:restore/restore.h
  */
 
 /*
-- 
2.30.2