[minidlna/el7: 23/23] fix merge
commit 02aab3e876d2e26b00e7b661b379dae9c27920ef
Merge: 9bacd20 21337d7
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Dec 4 10:54:09 2018 +0000
fix merge
.gitignore | 4 +-
minidlna.service | 25 ++++++-----
minidlna.spec | 131 ++++++++++++++++++++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 104 insertions(+), 58 deletions(-)
---