From: Rob Sayre <sayrer@gmail.com>
Date: Mon, 4 Jul 2011 21:48:13 +0000 (-0700)
Subject: Resolve merge conflict in test_slave.html.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f4b169ddba10e8bf59552a9813aef5a3fa58f7e8;p=pdf.js.git

Resolve merge conflict in test_slave.html.
---

f4b169ddba10e8bf59552a9813aef5a3fa58f7e8