.

2026-07-05 04:53:13 +02:00 · 2001-02-18 16:04:57 +00:00
parent 2d455fee85
commit e56b347bb1
1 changed files with 0 additions and 1 deletions
@@ -211,7 +211,6 @@
 - Made tld {} get rehashed
 - Made listen/allow get validated
 - Finished up validate_conf()
-<<<<<<< Changes
 - Made badwords be in newconf (you can now specify a replace word for each word)
 - Made vhosts and badwords rehash
 - Fixed a bug in the rehash code