Conflict resolved.
[platform/upstream/rpm.git] / db / db_archive /
drwxr-xr-x   ..
-rw-r--r-- 3425 db_archive.c