Revert "fix conflict"

This reverts commit 6d7633e.
S-HuaBomb · Aug 7, 2022 · e2d5299 · e2d5299
1 parent 93cf5a6
commit e2d5299
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/docs/api/paddle/vision/transforms/normalize_cn.rst b/docs/api/paddle/vision/transforms/normalize_cn.rst
@@ -24,4 +24,8 @@ normalize
 代码示例
 :::::::::
 
+<<<<<<< HEAD
 COPY-FROM: paddle.vision.transforms.normalize
+=======
+COPY-FROM: paddle.vision.transforms.normalize
+>>>>>>> a9a9e5f1bae68111466de92475d57e81a866bb5f