diff options
author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-19 23:17:53 +0000 |
---|---|---|
committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-19 23:17:53 +0000 |
commit | 34bb7a125e56d2f9bb271b6864f840560a5f4257 (patch) | |
tree | 2c9f1571eae5c83aaaf3e7f2535e742696b31eb4 /web/index.txt | |
parent | 661c7e7b1da0af7132767f5522c56fb8ae370ee9 (diff) | |
download | pandoc-34bb7a125e56d2f9bb271b6864f840560a5f4257.tar.gz |
Fixed a minor mistake introduced in resolving conflicts from the
merge.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@243 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'web/index.txt')
0 files changed, 0 insertions, 0 deletions