# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      ChangeLog
#	both modified:      Makefile
#	both modified:      README
#	deleted by them:    bin/Makefile
#	added by us:        bin/sh-static.i386
#	both modified:      doc/admin/admin-manual.sgml
#	both modified:      doc/judge/judge-manual.sgml
#	both added:         doc/team/README
#	deleted by them:    doc/team/systemconfig.tex
#	both modified:      doc/team/team-manual-NL.tex
#	both modified:      doc/team/team-manual-preamble.tex
#	both modified:      doc/team/team-manual.tex
#	deleted by them:    etc/apache.template.conf
#	deleted by them:    etc/config.h
#	deleted by them:    etc/config.php
#	deleted by them:    etc/config.sh
#	deleted by them:    etc/config.template.php
#	deleted by them:    etc/config.template.sh
#	deleted by them:    etc/config.tex
#	deleted by them:    etc/generate_apacheconf.sh
#	deleted by them:    etc/global.cfg
#	deleted by us:      judge/compare.c
#	both modified:      judge/compile_java.sh
#	both modified:      judge/judgedaemon.main.php
#	both modified:      judge/runguard.c
#	both modified:      judge/test_solution.sh
#	both modified:      lib/lib.misc.h
#	both modified:      lib/lib.misc.php
#	both modified:      lib/www/checkers.jury.php
#	both modified:      lib/www/common.php
#	both modified:      lib/www/scoreboard.php
#	both modified:      lib/www/validate.team.php
#	both modified:      sql/Makefile
#	both modified:      sql/mysql_db_structure.sql
#	both modified:      submit/submit_db.php.in
#	both modified:      submit/submitdaemon.cc
#	both modified:      www/jury/checkconfig.php
#	both modified:      www/jury/contest.php
#	both modified:      www/jury/contests.php
#	both modified:      www/jury/init.php
#	both modified:      www/jury/judgehost.php
#	both modified:      www/jury/menu.php
#	both modified:      www/jury/problem.php
#	both modified:      www/jury/problems.php
#	both modified:      www/jury/scoreboard.php
#	both modified:      www/jury/submission.php
#	both modified:      www/jury/submissions.php
#	both modified:      www/jury/team.php
#	both modified:      www/jury/teams.php
#	both modified:      www/jury/testcase.php
#	both modified:      www/public/index.php
#	both modified:      www/style.css
#	both modified:      www/team/checkpasswd.php
#	both modified:      www/team/init.php
#	both modified:      www/team/menu.php
#	both modified:      www/team/submission_details.php
#	both modified:      www/team/upload.php
#
# Untracked files not listed (use -u option to show untracked files)