From 748090b325134850a0d5de55a17310855a4c0949 Mon Sep 17 00:00:00 2001
From: Mika Suomalainen <mika.henrik.mainio@hotmail.com>
Date: Sun, 6 Nov 2011 12:52:36 +0200
Subject: [PATCH] Added push.sh to gitignore.

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

diff --git a/.gitignore b/.gitignore
index d3ee8da4..d89e059b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # It seems that running install.sh causes <filename>~ files in this git repo. They are lockfiles.
 *~
 push.sh
+merge.sh