From 26a203e9963502c513b22964f82ab1a2961ee6d7 Mon Sep 17 00:00:00 2001 From: Zhang Xingtao Date: Thu, 18 Jan 2018 21:27:59 +0800 Subject: [PATCH] merge the separate .gitignore rule --- .gitignore | 2 +- docs/demo_guide/.gitignore | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 docs/demo_guide/.gitignore diff --git a/.gitignore b/.gitignore index 3985c49775..5aed6d7571 100644 --- a/.gitignore +++ b/.gitignore @@ -94,4 +94,4 @@ modules/drivers/gnss/conf/conf_us modules/calibration/data/mkz056 # Data bag -docs/demo_guide/demo_1.5.np.bag +docs/demo_guide/*.bag diff --git a/docs/demo_guide/.gitignore b/docs/demo_guide/.gitignore deleted file mode 100644 index c527362202..0000000000 --- a/docs/demo_guide/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignore demo rosplay bags -*.bag -- GitLab