fixing merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/static/js/win.js b/static/js/win.js
index 7571791..670d6b4 100644
--- a/static/js/win.js
+++ b/static/js/win.js
@@ -85,7 +85,7 @@ function CreateDropdownWindow( caption, theWidth, canMove, contentSource, startX
     newdiv.innerHTML = jstrprintf(
         '<table><tr><td>$1</td>' + 
         '<td style="text-align:right">' +
-        '<img src="/static/buttontop.gif" class="divTitleButton" id="dragButton$2" ' + 
+        '<img src="/static/img/buttontop.gif" class="divTitleButton" id="dragButton$2" ' + 
         'onmousedown="javascript:toggleContentWin($2)" /></td>' +
         '</tr></table>',
         caption, nextID);
@@ -155,14 +155,14 @@ function toggleContentWin(id) {
         elem.style.display = "block";
         
         // Change the button's image
-        img.src = "/static/buttontop.gif";
+        img.src = "/static/img/buttontop.gif";
 }
     else {
         // showing, so hide
         elem.style.display = "none";
 
         // Change the button's image
-        img.src = "/static/buttonbottom.gif";
+        img.src = "/static/img/buttonbottom.gif";
     }
 }