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 /// /// Encapsulates the metadata of an image.