fix merge conflict

PaddlePaddle · Feb 17, 2023 · f046180 · f046180
1 parent 9ceafc9
commit f046180
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 398 deletions.
diff --git a/paddle/fluid/prim/api/auto_code_generated/prim_base.py b/paddle/fluid/prim/api/auto_code_generated/prim_base.py