fixed a typo in yaml file.

vanbasten23 · vanbasten23 · commit 640ea5b3ffc2 · 2022-09-16T18:53:11.000Z
diff --git a/xla_native_functions.yaml b/xla_native_functions.yaml
@@ -43,11 +43,8 @@ full_codegen:
   - ge.Tensor
   - gt.Scalar
   - gt.Tensor
-<<<<<<< HEAD
   - hardshrink
-=======
   - hardshrink_backward
->>>>>>> Codegen HardshrinkBackward and SoftshrinkBackward.
   - hardsigmoid
   - hardsigmoid_backward
   - hardswish
