]> git.parisson.com Git - pdf.js.git/commit
Resolve merge conflict in test_slave.html.
authorRob Sayre <sayrer@gmail.com>
Mon, 4 Jul 2011 21:48:13 +0000 (14:48 -0700)
committerRob Sayre <sayrer@gmail.com>
Mon, 4 Jul 2011 21:48:13 +0000 (14:48 -0700)
commitf4b169ddba10e8bf59552a9813aef5a3fa58f7e8
tree0e8a81424310d787f4ef1f501d934404ab81a176
parent1aa0b390b9fb252f462925bdffb234b1d6a828c5
parent67baa86c608368803b6460aef18b79c2f48b18e1
Resolve merge conflict in test_slave.html.