fixed merge conflicts

diff --cc encode.php
index 123fcc9,1cbac74..bad7b4b
--- 1/encode.php
--- 2/encode.php
+++ b/encode.php
@@@ -50,7 -50,8 +50,7 @@@ function enc_html($str) 
        return $str;
  }
  
- # Encode for output in html. converts \n to <br />
 -
 -# Encode for output in html. Converts newlines to <br />
++# Encode for output in html. Convert newlines to <br />
  #
  # Example: <p>~foo.html~</p>
  function enc_htmlbr($str) {