Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [PATCH v2] Trying to get the C/R code to compile again. (last)
From: Adrian Reber (adrian_at_[hidden])
Date: 2013-12-09 14:41:19


No, I removed an existing conflict from that file. It has been committed
with a conflict in the copyright statement. This patch removes it.

On Mon, Dec 09, 2013 at 10:08:49AM -0800, Ralph Castain wrote:
> Oh, and note that you have an unresolved conflict in this patch!
>
>
> On Dec 9, 2013, at 5:38 AM, Adrian Reber <adrian_at_[hidden]> wrote:
>
> > diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c
> > index dd539cd..b91f4a3 100644
> > --- a/orte/mca/rml/oob/rml_oob_component.c
> > +++ b/orte/mca/rml/oob/rml_oob_component.c
> > @@ -11,11 +11,7 @@
> > * Copyright (c) 2004-2005 The Regents of the University of California.
> > * All rights reserved.
> > * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
> > -<<<<<<< .mine
> > - * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
> > -=======
> > * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
> > ->>>>>>> .r28253
> > * All rights reserved.
> > * $COPYRIGHT$
> > *
>

> _______________________________________________
> devel mailing list
> devel_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/devel