[hdf5/f16] Cleanup merge

[Orion Poplawski]

commit c47a136071f07eeb1d1b8cf56760488f7cd361de
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Nov 25 16:39:54 2011 -0700

    Cleanup merge

 hdf5.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 761b35e..49adb22 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -376,7 +376,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
 * Fri Nov 18 2011 Orion Poplawski <orion at cora.nwra.com> 1.8.7-3
 - Add rpm macro %%{_hdf5_version} for convenience
 - Enable static MPI builds