In-house patch created to clear any merge conflicts from source in archive
repo to build properly on Solaris.

--- CACKey-0.7.4/cackey.spec	2016-05-20 01:53:54.710093467 -0400
+++ CACKey-0.7.4/cackey.spec	2016-05-20 01:34:23.363490949 -0400
@@ -5,12 +5,10 @@
 Release: 1
 License: Public Domain
 Packager: Roy Keene <[email protected]>
-=======
 Version: @@VERS@@
 Release: 1
 License: Public Domain
 Packager: Roy Keene <[email protected]>
->>>>>>> trunk
 URL: https://software.forge.mil/sf/frs/do/listReleases/projects.community_cac/frs.cackey
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -23,11 +21,7 @@
 PC/SC compliant reader.  It performs a similar function to "CoolKey", but
 only supports Government Smartcards.  It supports all Government Smartcards
 that implement the Government Smartcard Interoperability Specification (GSC-IS)
-<<<<<<< HEAD
-v2.1 or newer.
-=======
 v2.1 or newer as well as PIV cards that comply with NIST SP 800-73-3.
->>>>>>> trunk
 
 
 %prep