From fa5ce2ddba8038b271e3e4307f794cf162e587d5 Mon Sep 17 00:00:00 2001
From: Alex Kavon <alexkavon@users.noreply.github.com>
Date: Fri, 13 Jun 2014 09:23:30 -0600
Subject: [PATCH] head conflicts fix

---
 src/Fetch/Message.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index 3b40620..98c8048 100644
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -171,13 +171,8 @@ class Message
 
     /**
      * 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.
      *
->>>>>>> d4d7f367ba5420678d140f500aa3374a1f7544d8
      * @var string
      */
     public static $charsetFlag = '//TRANSLIT';