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