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