drumkv1 repo - failed merge

[Jaromír Mikeš]

Hi Team,

I have proble with drumkv1 repo ... I've got merge conflict during
importing orig tarball.
I've tried to solve it but apparently not well.
While building package I am getting this error:

dpkg-source: info: local changes detected, the modified files are:
 drumkv1/ChangeLog
 drumkv1/configure
 drumkv1/configure.ac
 drumkv1/drumkv1.spec.in
 drumkv1/src/drumkv1.cpp
 drumkv1/src/drumkv1.h
 drumkv1/src/drumkv1.qrc
 drumkv1/src/drumkv1_ui.cpp
 drumkv1/src/drumkv1_ui.h
 drumkv1/src/drumkv1widget_elements.cpp
 drumkv1/src/drumkv1widget_elements.h

Can someone advise me how to fix it pls?

best regrads

mira
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20170627/b3a947eb/attachment.html>