From 1ff12362da672ddfd7083cf169757aa1aca62fe3 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Mon, 9 Dec 2013 20:20:14 +0000
Subject: [PATCH] Cleanup merge conflict that was incorrectly committed

This commit was SVN r29851.
---
 orte/mca/rml/oob/rml_oob_component.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c
index dd539cdf0d..f0b22fcf20 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$
  *