Conflict resolved.
[platform/upstream/rpm.git] / db / perl /
drwxr-xr-x   ..
drwxr-xr-x - BerkeleyDB
drwxr-xr-x - DB_File