fix conflict

S-HuaBomb · S-HuaBomb · commit 6d7633e17e29 · 2022-08-05T16:51:38.000+08:00
diff --git a/docs/api/paddle/vision/transforms/normalize_cn.rst b/docs/api/paddle/vision/transforms/normalize_cn.rst
@@ -24,8 +24,4 @@ normalize
 代码示例
 :::::::::
 
-<<<<<<< HEAD
 COPY-FROM: paddle.vision.transforms.normalize
-=======
-COPY-FROM: paddle.vision.transforms.normalize
->>>>>>> a9a9e5f1bae68111466de92475d57e81a866bb5f
