Conflict resolved.
[platform/upstream/rpm.git] / db / hmac /
drwxr-xr-x   ..
-rw-r--r-- 5082 hmac.c
-rw-r--r-- 9225 sha1.c