removed conflict

openvinotoolkit · Dec 15, 2020 · 2bbbca9 · 2bbbca9
1 parent 999bfdc
commit 2bbbca9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/ngraph/core/include/ngraph/opsets/opset6.hpp b/ngraph/core/include/ngraph/opsets/opset6.hpp
@@ -27,4 +27,3 @@ namespace ngraph
 #undef NGRAPH_OP
     } // namespace opset6
 } // namespace ngraph
-
diff --git a/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp
@@ -77,10 +77,6 @@ NGRAPH_OP(Maximum, ngraph::op::v1)
 NGRAPH_OP(Minimum, ngraph::op::v1)
 NGRAPH_OP(Mod, ngraph::op::v1)
 NGRAPH_OP(Multiply, ngraph::op::v1)
-<<<<<<< HEAD
-=======
-NGRAPH_OP(MVN, ngraph::op::v0)
->>>>>>> de2edcf1c (Initial support of GatherElements in MO and nGraph)
 NGRAPH_OP(Negative, ngraph::op::v0)
 NGRAPH_OP(NormalizeL2, ngraph::op::v0)
 NGRAPH_OP(NotEqual, ngraph::op::v1)
@@ -179,4 +175,3 @@ NGRAPH_OP(Round, ngraph::op::v5)
 // New operations added in opset6
 NGRAPH_OP(MVN, ngraph::op::v6)
 NGRAPH_OP(GatherElements, ngraph::op::v6)
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,3 @@ namespace ngraph
		#undef NGRAPH_OP
		} // namespace opset6
		} // namespace ngraph