From 52d60f8f3e7facae91eb8b804f6b48f791b070a4 Mon Sep 17 00:00:00 2001
From: dzhwinter <dzhwinter@gmail.com>
Date: Sun, 2 Sep 2018 11:11:51 +0800
Subject: [PATCH] merge conclit

---
 paddle/fluid/operators/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/paddle/fluid/operators/CMakeLists.txt b/paddle/fluid/operators/CMakeLists.txt
index d3ca385937c..8b910928822 100644
--- a/paddle/fluid/operators/CMakeLists.txt
+++ b/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()
-- 
GitLab