# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1224507255 -28800
# Node ID 336164c9a9836b7fbc841afc819ca61cc96b3155
# Parent  d2ac1e198ce4673fec3394170dac16ff54d7510e# Parent  ec5bc0f68e68a7f094d7794ce23ce94c0a91f1dd
fixed the conflict

diff -r d2ac1e198ce4 -r 336164c9a983 .hgignore
--- 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