From 372c75ee680e28b072b752c03484210b77d4237d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 28 Jun 2011 21:27:00 -0700
Subject: how the heck did favicon get into the repo? Gone now...

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bb8f88f75..41ec42389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,9 @@
 favicon.*
 .htconfig.php
 \#*
-wip/*
 include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-push*
-langup
-merge
+favicon.*
 home.html
-- 
cgit v1.2.3