From 765a65fab431bd547852c31e82f2cadeb5ef7ece Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Mon, 21 Jun 2010 17:19:55 +0000
Subject: [PATCH] Fixed file conflict

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2434 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
 modules/img/base/src/image_impl.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/img/base/src/image_impl.cc b/modules/img/base/src/image_impl.cc
index 09ec52126..e9280ba48 100644
--- a/modules/img/base/src/image_impl.cc
+++ b/modules/img/base/src/image_impl.cc
@@ -29,5 +29,4 @@ ImageImpl CreateImageImpl(const Extent& e, DataType type, DataDomain dom)
   return ImageImpl(new ImageStateBasePtr(CreateState(e,type,dom)));
 }
 
-
 }} // ns
-- 
GitLab