From 7b3043a59bd01c77d22da3cfd0e4951820c8e972 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 5 Mar 2015 11:15:01 -0500
Subject: [PATCH] Warning fixes.

---
 components/net/resource_task.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 3ce69bfce17..0d4bc19a64d 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -35,7 +35,6 @@ use std::thunk::Invoke;
 static mut HOST_TABLE: Option<*mut HashMap<String, String>> = None;
 
 pub fn global_init() {
-<<<<<<< HEAD
     //TODO: handle bad file path
     let path = match env::var("HOST_FILE") {
         Ok(host_file_path) => host_file_path,