modified: src/maintain/scripts/maintain.py

2023-05-10 20:26:12 +08:00
parent 47083e478d
commit 4d78759009
1 changed files with 0 additions and 4 deletions
--- a/src/maintain/scripts/maintain.py
+++ b/src/maintain/scripts/maintain.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 #! /home/da/miniconda3/envs/gsmini/bin/python
-=======
-#! /home/wxchen/.conda/envs/gsmini/bin/python
->>>>>>> 68e8ba7901e9856d4a89304bc278ab76e8cc0a34

 import rospy
 import numpy as np