merge conclit

paddle/fluid/operators/CMakeLists.txt

@@ -85,13 +85,9 @@ function(op_library TARGET)
 
     #remove windows unsupported op
     if (WIN32)
-<<<<<<< HEAD
     # no nccl, no avx instructions ops.
     foreach(windows_unsupport_op "nccl_op" "gen_nccl_id_op" "warpctc_op" "hierarchical_sigmoid_op"
      "crf_decoding_op" "select_op" "lstmp_op" "gru_op" "lstm_op" "fusion_lstm_op")
-=======
-    foreach(windows_unsupport_op "nccl_op" "gen_nccl_id_op" "warpctc_op")
->>>>>>> origin/develop
         if ("${TARGET}" STREQUAL "${windows_unsupport_op}")
           return()
         endif()