From 2dfdf47b5956c47a9347d5fd600384bee47372d3 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Tue, 20 Dec 2011 12:06:32 -0500
Subject: ignore merge modules

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b7831832c701..e9864e250433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,7 @@ TAGS
 /external/*/*.exe
 /external/*/*.manifest
 /external/*/*.txt
+/external/*/*.msm
 /moz/zipped/*.zip
 /extras/source/extensions
 
-- 
cgit