diff options
| author | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
|---|---|---|
| committer | tim b <timb@camcompu.home> | 2010-04-07 18:59:50 -0700 |
| commit | 6440348618ade4fbcb541c40473074833a47d198 (patch) | |
| tree | 537ab7e4f0af7deba51bbfb360fe490968d651f8 /template/browser.st | |
| parent | 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff) | |
| parent | 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff) | |
fixing merge conflicts
Diffstat (limited to 'template/browser.st')
| -rw-r--r-- | template/browser.st | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/template/browser.st b/template/browser.st index 28a514d..8cb6403 100644 --- a/template/browser.st +++ b/template/browser.st @@ -49,9 +49,7 @@ </div> <div id="messagePane"> <div id="messageList"> - <iframe src="/static/search/browser.html" - allowtransparency="true" - scrolling="auto" ></iframe> + <iframe src="/static/search/browser.html" allowtransparency="true" scrolling="auto" ></iframe> </div> </div> |