ignore local merge script

author Friendika <info@friendika.com>

Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)

committer Friendika <info@friendika.com>

Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)
author Friendika <info@friendika.com>
Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)
committer Friendika <info@friendika.com>
Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)
diff --git a/.gitignore b/.gitignore

index 9b3b23a002f7de502c7afa2c46b6317dc3a926ea..bb8f88f759bca82802fb57c4393410a3fcbd1438 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
  *.version*
  push*
  langup
+merge
  home.html
author	Friendika <info@friendika.com>
	Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)
committer	Friendika <info@friendika.com>
	Thu, 23 Jun 2011 23:10:36 +0000 (16:10 -0700)