|
|
@ -5,13 +5,9 @@ |
|
|
|
|
|
|
|
|
namespace ImageSharp |
|
|
namespace ImageSharp |
|
|
{ |
|
|
{ |
|
|
using System; |
|
|
|
|
|
using System.Collections.Generic; |
|
|
using System.Collections.Generic; |
|
|
<<<<<<< HEAD |
|
|
|
|
|
using System.Linq; |
|
|
using System.Linq; |
|
|
======= |
|
|
|
|
|
using ImageSharp.Formats; |
|
|
using ImageSharp.Formats; |
|
|
>>>>>>> refs/remotes/origin/master |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Encapsulates the metadata of an image.
|
|
|
/// Encapsulates the metadata of an image.
|
|
|
|