RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2025-02-06 10:39:21 +03:00
Code Issues Projects Releases Wiki Activity

head conflicts fix

Browse Source
This commit is contained in:
Alex Kavon 2014-06-13 09:23:30 -06:00
parent c6c80ac45b
commit fa5ce2ddba
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Fetch/Message.php
View File

@ -171,13 +171,8 @@ class Message
/** /**
* This value defines the flag set for encoding if the mb_convert_encoding * This value defines the flag set for encoding if the mb_convert_encoding
<<<<<<< HEAD
* function can't be found. In this case iconv encoding will be used.
*
=======
* 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
* @var string * @var string
*/ */
public static $charsetFlag = '//TRANSLIT'; public static $charsetFlag = '//TRANSLIT';