fix conflict

HermitSun · Aug 5, 2022 · 6d7633e · 6d7633e
1 parent 1d37f73
commit 6d7633e
Showing 1 changed file with 0 additions and 4 deletions.
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