Skip to content
Snippets Groups Projects
Commit 765a65fa authored by valerio's avatar valerio
Browse files

Fixed file conflict 

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2434 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent 4095ac38
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/img/base/src/image_impl.cc
+ 0
− 1
View file @ 765a65fa
...@@ -29,5 +29,4 @@ ImageImpl CreateImageImpl(const Extent& e, DataType type, DataDomain dom) ...@@ -29,5 +29,4 @@ ImageImpl CreateImageImpl(const Extent& e, DataType type, DataDomain dom)
return ImageImpl(new ImageStateBasePtr(CreateState(e,type,dom))); return ImageImpl(new ImageStateBasePtr(CreateState(e,type,dom)));
} }
}} // ns }} // ns
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment