fix conflict

luo-cheng2021 · Apr 22, 2021 · f078fb8 · f078fb8
1 parent 9277eae
commit f078fb8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ngraph/frontend/paddlepaddle/src/op_table.cpp b/ngraph/frontend/paddlepaddle/src/op_table.cpp
@@ -89,15 +89,15 @@ std::map<std::string, CreatorFunction> get_supported_ops() {
             {"bmm", op::matmul},
             {"depthwise_conv2d", op::conv2d},
             {"uniform_random", op::uniform_random},
-            {"assign_value", op::assign_value}
+            {"assign_value", op::assign_value},
             {"sigmoid", op::sigmoid},
             {"hard_sigmoid", op::hard_sigmoid},
             {"relu6", op::relu6},
             {"pow", op::pow},
             {"squeeze2", op::squeeze},
             {"unsqueeze2", op::unsqueeze},
             {"slice", op::slice},
-            {"hard_swish", op::hard_swish},
+            {"hard_swish", op::hard_swish}
         };
 };