1 files changed, 1 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 9b3b23a00..bb8f88f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
 *.version*
 push*
 langup
+merge
 home.html