Update version to mark arch build.

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index da8534ff59232ceb31b688e4a72fbf3d80caad05..cabbc1886a35db8e26654690ba065b51f4185db7 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -3,9 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
- *
- * $Id: merge.h,v 1.6 2004/05/31 14:16:49 noodles Exp $
+ * Copyright 2002-2004 Project Purple
  */
 
 #ifndef __MERGE_H__
@@ -27,18 +25,6 @@
  */
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
-/**
- *     update_keys - Takes a list of public keys and updates them in the DB.
- *     @keys: The keys to update in the DB.
- *
- *     Takes a list of keys and adds them to the database, merging them with
- *     the key in the database if it's already present there. The key list is
- *     update to contain the minimum set of updates required to get from what
- *     we had before to what we have now (ie the set of data that was added to
- *     the DB). Returns the number of entirely new keys added.
- */
-int update_keys(struct openpgp_publickey **keys);
-
 /**
  *     get_signed_packet - Gets a signed packet from a list.
  *     @packet_list: The list of packets to look in.