From ca5e299f1f8c64e185fe6e5e3230cf93b753b6db Mon Sep 17 00:00:00 2001
From: James South <james_south@hotmail.com>
Date: Thu, 4 Sep 2014 14:48:21 +0100
Subject: [PATCH] Fixing merge conflict

Former-commit-id: 10badff56a72fda7f479a9946c393e8890dfdc38
---
 src/ImageProcessor.Web/Properties/AssemblyInfo.cs | 2 +-
 src/ImageProcessor/Properties/AssemblyInfo.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
index 4f1c51a1e7..89ec3b951c 100644
--- a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AssemblyInfo.cs" company="James South">
 //   Copyright (c) James South.
 //   Licensed under the Apache License, Version 2.0.
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
index c0669d12a7..0980baf3ba 100644
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AssemblyInfo.cs" company="James South">
 //   Copyright (c) James South.
 //   Licensed under the Apache License, Version 2.0.