Merge branch 'stable-2.12'
* stable-2.12:
Add 'eclipse-out' to the list of ignored folders
Change-Id: Ia6b10050fc6af57ffa62cb276a27e8047b926971
diff --git a/.buckconfig b/.buckconfig
index 65bac24..42b08db 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -6,7 +6,7 @@
src_roots = java, resources
[project]
- ignore = .git
+ ignore = .git, eclipse-out
[cache]
mode = dir
diff --git a/.gitignore b/.gitignore
index 1d71845..f90bb5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/.watchmanconfig
/buck-out/
/bucklets
+/eclipse-out