fix incorrect merge resolution from ab052d32c5 see: #5
authorValentin Haenel <valentin.haenel@gmx.de>
Thu, 30 May 2013 14:38:28 +0000 (16:38 +0200)
committerValentin Haenel <valentin.haenel@gmx.de>
Thu, 30 May 2013 14:38:28 +0000 (16:38 +0200)
commit85658167e51839bcecd60c71e1ff52eaa625e9af
treece66a48b9e6b7c7934d33eb1a6b4fb7e00ef4ae2
parent6b0a19a289f141832fb308ffdfbb96b428f6e7a1
fix incorrect merge resolution from ab052d32c5 see: #5
code/wiki2beamer