1 In-house patch created to clear any merge conflicts from source in archive

     2 repo to build properly on Solaris.

     3 

     4 --- CACKey-0.7.4/autogen.sh	2016-05-19 16:20:45.459266138 -0400

     5 +++ CACKey-0.7.4/autogen.sh	2015-07-16 12:20:20.000000000 -0400

     6 @@ -6,8 +6,6 @@

     7  autoconf; autoheader

     8  

     9  rm -rf autom4te.cache/

    10 -<<<<<<< HEAD

    11 -=======

    12  

    13  for basefile in install-sh config.sub config.guess; do

    14  	for path in /usr/share/automake-*; do

    15 @@ -20,4 +18,3 @@

    16  		fi

    17  	done

    18  done

    19 ->>>>>>> trunk