fixed merge conflicts and small addings
authorMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:33:33 +0000 (15:33 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:33:33 +0000 (15:33 +0200)
commit6c6a35507e8a6675bd34affc1070e0342ef6d7c3
tree261abe23a0a10dfe7b8b1ff4dded5eff7f638708
parente089f81414c5d661914480e8ec0de354b1b93b33
fixed merge conflicts and small addings
conf.tex
intro.tex
samen.tex [deleted file]
server.tex
truuk.tex