From b98632e4820ea1bf9609c9a88719072b2cbccbc3 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Tue, 17 Mar 2015 13:29:46 -0400
Subject: [PATCH] no more .merged files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7ba6863fb..59794f7bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@
 ## Sublime Text
 *.sublime-*
 
+## Translation files
+lang/*.merged
+
 ## Misc
 .idea/
 node_modules