https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas@lrde.epita.fr> Fix a compilation bug. * mln/core/dpoint2d.hh: remove lines created by a svn conflict. dpoint2d.hh | 4 ---- 1 file changed, 4 deletions(-) Index: mln/core/dpoint2d.hh --- mln/core/dpoint2d.hh (revision 2169) +++ mln/core/dpoint2d.hh (working copy) @@ -1,8 +1,4 @@ -<<<<<<< HEAD:milena/mln/core/dpoint2d.hh -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -======= // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) ->>>>>>> remotes/trunk:milena/mln/core/dpoint2d.hh // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms