resolve conflicts

mindest · mindest · commit 3a7171fb7175 · 2019-03-01T23:41:33.000+08:00
diff --git a/tf2onnx/tfonnx.py b/tf2onnx/tfonnx.py
@@ -1905,8 +1905,8 @@ def where_op(ctx, node, name, args):
     "Less": (logical_compare_op, []),
     "ResizeBilinear": (upsample_op9, ["Upsample", "linear"]),
     "ResizeNearestNeighbor": (upsample_op9, ["Upsample", "nearest"]),
-    "Where": (where_op, []),
     "Sinh": (direct_op, []),
+    "Where": (where_op, []),
 }
 
 _OPSETS = [

Original file line number	Diff line number	Diff line change
`@@ -1905,8 +1905,8 @@ def where_op(ctx, node, name, args):`
`1905`	`1905`	`"Less": (logical_compare_op, []),`
`1906`	`1906`	`"ResizeBilinear": (upsample_op9, ["Upsample", "linear"]),`
`1907`	`1907`	`"ResizeNearestNeighbor": (upsample_op9, ["Upsample", "nearest"]),`
`1908`		`- "Where": (where_op, []),`
`1909`	`1908`	`"Sinh": (direct_op, []),`
	`1909`	`+ "Where": (where_op, []),`
`1910`	`1910`	`}`
`1911`	`1911`
`1912`	`1912`	`_OPSETS = [`