update

2c0b4c2a · liuyq-617 · d6918703 · 2c0b4c2a
隐藏空白更改
内联并排

Showing with 1 addition and 7 deletion

tests/pytest/pytest_1.sh tests/pytest/pytest_1.sh +1 -7

未找到文件。
--- a/tests/pytest/pytest_1.sh
+++ b/tests/pytest/pytest_1.sh
@@ -230,13 +230,7 @@ python3 test.py -f tools/lowaTest.py
 python3 test.py -f tools/taosdemoTest2.py
 # subscribe
-<<<<<<< HEAD
 python3 test.py -f subscribe/singlemeter.py
-#python3 test.py -f subscribe/stability.py 
+#python3 test.py -f subscribe/stability.py  
 python3 test.py -f subscribe/supertable.py
-=======
-#python3 test.py -f subscribe/singlemeter.py
-#python3 test.py -f subscribe/stability.py
-#python3 test.py -f subscribe/supertable.py
->>>>>>> develop