Fix merge glitches, get it to build.

[wget] / .hgignore

diff --git a/.hgignore b/.hgignore
index 666c5c382419fb9ad7c1e6a47c6fa927868526fe..58932bb021bb5e5033d4894039138e4d3a3eae13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -28,6 +28,7 @@ src/.deps
 src/stamp-h1
 src/config.h
 src/config.h.in
+src/css.c
 src/wget
 src/cscope.out
 src/tags