Fix some errors from conflict resulution

plugins/sslutils.c

@@ -77,6 +77,7 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
 		method = SSLv3_client_method();
 		ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1;
 		break;
+#endif
 	default: /* Unsupported */
 		printf("%s\n", _("CRITICAL - Unsupported SSL protocol version."));
 		return STATE_CRITICAL;

plugins/utils.c

@@ -726,6 +726,8 @@ char *sperfdata (const char *label,
 	}
 
 	return data;
+}
+
 /* set entire string to lower, no need to return as it works on string in place */
 void strntolower (char * test_char, int size) {