resolve conflict

usdot-fhwa-stol · Apr 10, 2024 · e814161 · e814161
1 parent e25eef6
commit e814161
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/jsk_common_msgs/.gitmodules b/jsk_common_msgs/.gitmodules
@@ -1,8 +1,3 @@
 [submodule ".travis"]
-<<<<<<< Updated upstream
 	path = .travis
 	url = git://github.com/jsk-ros-pkg/jsk_travis
-=======
-	path = jsk_common_msgs/.travis
-	url = git://github.com/jsk-ros-pkg/jsk_travis
->>>>>>> Stashed changes