Fix ImageMetaData

9 years ago · 1cab841b3a
1 changed files with 0 additions and 4 deletions
--- 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.