changeset 53:336164c9a983

fixed the conflict
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Mon, 20 Oct 2008 20:54:15 +0800
parents d2ac1e198ce4 (current diff) ec5bc0f68e68 (diff)
children 2d3c394b7940
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Oct 20 19:07:53 2008 +0800
+++ b/.hgignore	Mon Oct 20 20:54:15 2008 +0800
@@ -1,10 +1,9 @@
 syntax: glob
-cookies.txt
+.eagleeye.pm
+.hgignore
 ikariam.sqlite
 perl
 samples
-sheep.sh
-sheep.txt
 *.html
 *.sh
 *.txt