From: Friendika <info@friendika.com>
Date: Thu, 23 Jun 2011 23:10:36 +0000 (-0700)
Subject: ignore local merge script
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2bc4e24da22d7a75bbdbae18e0c64575ff7fe858;p=friendica.git

ignore local merge script
---

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