diff options
author | Hans Nilsson <[email protected]> | 2014-10-08 18:24:22 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2014-10-08 18:24:22 +0200 |
commit | 1aa1a4f6173e9ef59ac0b6bb054368c141000062 (patch) | |
tree | 86e54690cd912fab2cdce42486091bab0713f642 | |
parent | 16cc8947cfe756772059b842f4cd98295ec00b6a (diff) | |
parent | 41ad734a5ee6a589fb5a7817c8e7a7894744c83a (diff) | |
download | otp-1aa1a4f6173e9ef59ac0b6bb054368c141000062.tar.gz otp-1aa1a4f6173e9ef59ac0b6bb054368c141000062.tar.bz2 otp-1aa1a4f6173e9ef59ac0b6bb054368c141000062.zip |
Merge branch 'hans/update_gitignore' into maint
* hans/update_gitignore:
ct: .gitignore ct_property_test.xml
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d40f49b56f..eb14036789 100644 --- a/.gitignore +++ b/.gitignore @@ -208,6 +208,7 @@ JAVADOC-GENERATED # common_test +/lib/common_test/doc/src/ct_property_test.xml /lib/common_test/doc/src/ct_slave.xml /lib/common_test/priv/install.sh |