diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
| commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
| tree | c4fdd4076025bb5b612bc88debab62709c311e5f /vendor/gitignore/Global/Eclipse.gitignore | |
| parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
| parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) | |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'vendor/gitignore/Global/Eclipse.gitignore')
| -rw-r--r-- | vendor/gitignore/Global/Eclipse.gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/gitignore/Global/Eclipse.gitignore b/vendor/gitignore/Global/Eclipse.gitignore index 0eb8a5e8571..a65649a9ed2 100644 --- a/vendor/gitignore/Global/Eclipse.gitignore +++ b/vendor/gitignore/Global/Eclipse.gitignore @@ -23,7 +23,7 @@ local.properties # CDT-specific (C/C++ Development Tooling) .cproject -# CDT- autotools +# CDT- autotools .autotools # Java annotation processor (APT) @@ -47,6 +47,9 @@ local.properties # Code Recommenders .recommenders/ +# Annotation Processing +.apt_generated/ + # Scala IDE specific (Scala & Java development for Eclipse) .cache-main .scala_dependencies |