[nwipe] merge error

[rebus]

commit 88abff12c19ae280b50b8cbd405e899fd2b75fe5
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Fri Aug 10 23:52:47 2012 +0200

    merge error

 nwipe.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/nwipe.spec b/nwipe.spec
index e1071a1..df29a87 100644
--- a/nwipe.spec
+++ b/nwipe.spec
@@ -52,7 +52,6 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
-<<<<<<< HEAD
 * Fri Aug 10 2012 Michal Ambroz <rebus at, seznam.cz> 0.10-1
 - upgrade to version 0.10