Merge commit 'upstream/0.4b42'

[debian/dump] / restore / restore.h

diff --git a/restore/restore.h b/restore/restore.h
index 51a3082d7f50d6f75483afb3fafd17b6ad2ccb00..459814d15aba20a75702b92796fe1000fe05e858 100644 (file)
--- a/restore/restore.h
+++ b/restore/restore.h
@@ -5,7 +5,11 @@
  *     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
  */
 
 /*