Fix more merge damage.
authorMichael Ang <mang@archive.org>
Thu, 21 Oct 2010 01:03:49 +0000 (01:03 +0000)
committerMichael Ang <mang@archive.org>
Thu, 21 Oct 2010 01:03:49 +0000 (01:03 +0000)
commit7b22d7d6bdbd35091bdb50c462d8ccb7950e9556
tree24a5c68844e381169bd608e812d7a48f5c9108ce
parentedb622c53581089c06d3099b6daa1ec58c053f76
Fix more merge damage.
BookReader/BookReader.css
BookReader/jquery.ui.ipad.js