Remove svn conflict lines due to commit r21551 in the sm btl. I #if 0'd out the offending line that cause the conflict just in case it was the correct one. However, this now compiles cleanly, minus the following warnings that I wasn't sure which way to resolve:

btl_sm.c: In function ‘mca_btl_sm_sendi’:
btl_sm.c:734: warning: comparison between signed and unsigned
btl_sm.c: In function ‘mca_btl_sm_send’:
btl_sm.c:812: warning: comparison between signed and unsigned

This commit was SVN r21552.

The following SVN revision numbers were found above:
  r21551 --> open-mpi/ompi@bd995d26b4

ompi/mca/btl/sm/btl_sm_component.c

@@ -428,11 +428,10 @@ int mca_btl_sm_component_progress(void)
                 /* return the fragment */
                 MCA_BTL_SM_FIFO_WRITE(
                         mca_btl_sm_component.sm_peers[peer_smp_rank],
-<<<<<<< .mine
                         my_smp_rank, peer_smp_rank, hdr->frag, false, true, rc);
-=======
+#if 0
                         my_smp_rank, peer_smp_rank, hdr->frag, false, rc);
->>>>>>> .r21550
+#endif
                 break;
             }
             case MCA_BTL_SM_FRAG_ACK: