resolve conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c
index 47d34b444e..4d0e1242ea 100644
--- a/src/lib/libcrypto/rc2/rc2speed.c
+++ b/src/lib/libcrypto/rc2/rc2speed.c
@@ -102,10 +102,10 @@ OPENSSL_DECLARE_EXIT
 #ifndef HZ
 #ifndef CLK_TCK
 #define HZ      100.0
-#endif
-#else /* CLK_TCK */
+#else   /* CLK_TCK */
 #define HZ ((double)CLK_TCK)
-#endif
+#endif  /* CLK_TCK */
+#endif  /* HZ */
 
 #define BUFSIZE ((long)1024)
 long run=0;