From 4d787590093baf81becdcb678643e55ad7361bab Mon Sep 17 00:00:00 2001 From: wxchen Date: Wed, 10 May 2023 20:26:12 +0800 Subject: [PATCH] modified: src/maintain/scripts/maintain.py --- src/maintain/scripts/maintain.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/maintain/scripts/maintain.py b/src/maintain/scripts/maintain.py index 392fcd7..14d2f0f 100755 --- 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