手工合入冲突文件

SHA-1: 798910a * [build] Use pip to install setup.py dependency instead of `python setup.py install` (sonic-net#9111) #### Why I did it Backport sonic-net#8997 to 202012 branch.
liuyuefengcn · Nov 14, 2023 · d9f8410 · d9f8410
1 parent 2171f07
commit d9f8410
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 26 deletions.
diff --git a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
diff --git a/src/redis-dump-load.patch/series b/src/redis-dump-load.patch/series
@@ -1,3 +1,2 @@
 0001-Use-pipelines-when-dumping-52.patch
 0002-Fix-setup.py-for-test-and-bdist_wheel.patch
-0003-use-redis-3.5.3.patch