[dnssec-check/f16: 4/14] merge fixes

[Wes Hardaker]

commit a93aaba665a56f6cc67f05d0731bb6d7d2405f63
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Mar 22 12:05:52 2012 -0700

    merge fixes

 dnssec-check.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/dnssec-check.spec b/dnssec-check.spec
index 354903f..e893117 100644
--- a/dnssec-check.spec
+++ b/dnssec-check.spec
@@ -75,7 +75,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 * Fri Feb  3 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12-3
 - Patch to use QML
 
->>>>>>> master
 * Thu Feb  2 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12-2
 - attempt forced rebuild for new dnssec-tools-libs