Merge branch 'log4j-2.12' of https://github.com/apache/logging-log4j2.git into log4j-2.12
diff --git a/.gitignore b/.gitignore
index fce0e91..45fee6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 .cache-tests
 .toDelete
 .factorypath
+.DS_Store
 velocity.log
 felix-cache/
 bin/