updated gitignore

This commit is contained in:
Ruixiang Du
2020-08-21 17:41:33 +08:00
parent 034163cc04
commit 18102d00e5

7
.gitignore vendored
View File

@@ -1,6 +1,5 @@
<<<<<<< HEAD
.vscode
=======
devel/
logs/
build/
@@ -19,9 +18,6 @@ msg/_*.py
build_isolated/
devel_isolated/
# Webots temporary files
scout_webots_sim/worlds/.scout_base.wbproj
# Generated by dynamic reconfigure
*.cfgc
/cfg/cpp/
@@ -58,4 +54,3 @@ qtcreator-*
# Catkin custom files
CATKIN_IGNORE
>>>>>>> scout_sim