diff options
| author | Lars Thorsen <[email protected]> | 2017-10-10 10:25:38 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2017-10-10 10:25:38 +0200 |
| commit | c07404052aa4ede2d8a5714d498637b304e11a6a (patch) | |
| tree | 2fcc506dcc73fb559dad4b08095ed15252fdbcff /.gitignore | |
| parent | e38c688d3961bedcd85f842fd052836cb345a902 (diff) | |
| parent | 23ed87829571316b4d026dd57bb69737921f7fcc (diff) | |
| download | otp-c07404052aa4ede2d8a5714d498637b304e11a6a.tar.gz otp-c07404052aa4ede2d8a5714d498637b304e11a6a.tar.bz2 otp-c07404052aa4ede2d8a5714d498637b304e11a6a.zip | |
Merge branch 'maint'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index a79bcf97c4..7bc051278c 100644 --- a/.gitignore +++ b/.gitignore @@ -261,7 +261,6 @@ JAVADOC-GENERATED # edoc -/lib/edoc/priv/edoc_generate /lib/edoc/src/edoc_parser.erl # erts |