merge

hardaker · hardaker · commit 1d79f40e833c · 2025-12-23T11:06:27.000-08:00
diff --git a/FAQ b/FAQ
@@ -1,10 +1,6 @@
       Frequently Asked Questions (FAQ) for the UCD/Net-SNMP package
       =============================================================
-		       FAQ Author: Dave Shield
-			Net-SNMP Version: 5.10.pre1
-=======
 			Net-SNMP Version: 5.10.pre2
->>>>>>> origin/master
 	    Net-SNMP/UCD-SNMP Project Leader: Wes Hardaker
 	     Email: net-snmp-coders@lists.sourceforge.net
 
diff --git a/NEWS b/NEWS
@@ -67,7 +67,6 @@ listing of all changes made to the code.
         EVP_aes_128_cfb() is available. - Add support for detecting SSL
         functions if these have been defined as macros.
 
-
 *5.9.5*
 
     snmptrapd:
