variable and message fix

This commit is contained in:
Alex 2014-06-13 09:11:12 -06:00
parent db0ef08142
commit c6c80ac45b

View File

@ -176,7 +176,7 @@ class Message
* *
======= =======
* function can't be found, and in this case iconv encoding will be used. * function can't be found, and in this case iconv encoding will be used.
* *
>>>>>>> d4d7f367ba5420678d140f500aa3374a1f7544d8 >>>>>>> d4d7f367ba5420678d140f500aa3374a1f7544d8
* @var string * @var string
*/ */