Update skin.js

Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00 · 2014-11-10 12:12:54 -06:00 · 26c9a77590
parent 3fe5724ca0
commit 26c9a77590
1 changed files with 0 additions and 3 deletions
--- a/web/skins/flat/js/skin.js
+++ b/web/skins/flat/js/skin.js
@ -306,8 +306,5 @@ if ( focusWindow )
 {
    windowToFront();
 }
-<<<<<<< HEAD
-=======

->>>>>>> release-1.28
 window.addEvent( 'domready', checkSize);