X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=7f1773eca706e8d0cfa4b7def3c83e54e78a24c3;hb=1a67fe6c4c85e0e9953a0c9d8a32ba1518e074b5;hp=8d870a22ced90791037d3bfd0d5f33410de09237;hpb=c07882446d1f6a830cb4d008bf9d20d3b38a7023;p=onak.git diff --git a/merge.c b/merge.c index 8d870a2..7f1773e 100644 --- a/merge.c +++ b/merge.c @@ -10,9 +10,9 @@ #include #include +#include "decodekey.h" #include "keydb.h" #include "keyid.h" -#include "keyindex.h" #include "keystructs.h" #include "ll.h" #include "mem.h"