diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch) | |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /.gitignore | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c (diff) | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 (diff) | |
Fix merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index a035c2b27..9edcfca6d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ user_guide_src/build/* user_guide_src/cilexer/build/* user_guide_src/cilexer/dist/* user_guide_src/cilexer/pycilexer.egg-info/* -/vendor/
\ No newline at end of file +/vendor/ +/nbproject/
\ No newline at end of file |