fixed conflict.
drwxr-xr-x - eeepc
-rw-r--r-- 10200 ikiwiki.setup
drwxr-xr-x - images
-rw-r--r-- 1432 index.mdwn
drwxr-xr-x - notes
-rw-r--r-- 605 presence.mdwn
drwxr-xr-x - projects
drwxr-xr-x - radio
-rw-r--r-- 37 robots.txt
drwxr-xr-x - tag
drwxr-xr-x - templates
drwxr-xr-x - user