From 2bc4e24da22d7a75bbdbae18e0c64575ff7fe858 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 23 Jun 2011 16:10:36 -0700 Subject: ignore local merge script --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 9b3b23a00..bb8f88f75 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js *.version* push* langup +merge home.html -- cgit v1.2.3 From 372c75ee680e28b072b752c03484210b77d4237d Mon Sep 17 00:00:00 2001 From: Friendika 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