From: Jason Woofenden <jason183@herkamire.com>
Date: Tue, 18 Sep 2007 03:07:41 +0000 (-0400)
Subject: fixed merge conflicts
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=commitdiff_plain;h=71fc7c41c946279b6d1e1072f72ad3f5aa6a7b39

fixed merge conflicts
---

71fc7c41c946279b6d1e1072f72ad3f5aa6a7b39
diff --cc encode.php
index 123fcc9,1cbac74..bad7b4b
--- a/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) {