From 1cab841b3ac21838a005901ec2e137843ce71309 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 2 May 2017 12:43:52 +1000
Subject: [PATCH] Fix ImageMetaData

---
 src/ImageSharp/MetaData/ImageMetaData.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ImageSharp/MetaData/ImageMetaData.cs b/src/ImageSharp/MetaData/ImageMetaData.cs
index 4e7579d8b9..b02dc62700 100644
--- a/src/ImageSharp/MetaData/ImageMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageMetaData.cs
@@ -5,13 +5,9 @@
 
 namespace ImageSharp
 {
-    using System;
     using System.Collections.Generic;
-<<<<<<< HEAD
     using System.Linq;
-=======
     using ImageSharp.Formats;
->>>>>>> refs/remotes/origin/master
 
     /// <summary>
     /// Encapsulates the metadata of an image.