projects
/
debian
/
dump
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a864f08
)
oops, missed this one in the merge!
author
Bdale Garbee
<bdale@gag.com>
Thu, 18 Jun 2009 15:40:36 +0000
(09:40 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Thu, 18 Jun 2009 15:40:36 +0000
(09:40 -0600)
restore/restore.h
patch
|
blob
|
history
diff --git
a/restore/restore.h
b/restore/restore.h
index 459814d15aba20a75702b92796fe1000fe05e858..51a3082d7f50d6f75483afb3fafd17b6ad2ccb00 100644
(file)
--- 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
*/
/*