]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - merge.c
cscvs to tla changeset 56
[onak.git] / merge.c
diff --git a/merge.c b/merge.c
index 8d870a22ced90791037d3bfd0d5f33410de09237..7f1773eca706e8d0cfa4b7def3c83e54e78a24c3 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"