From 1550afeea2259d941ec3f4b53605cafba14b3bea Mon Sep 17 00:00:00 2001
From: Sanj B <b@pad.ma>
Date: Fri, 6 Jan 2012 17:54:12 +0530
Subject: [PATCH] resolved local conflicts

---
 js/speedtrans.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/speedtrans.js b/js/speedtrans.js
index 67bb199..7f605f4 100644
--- a/js/speedtrans.js
+++ b/js/speedtrans.js
@@ -3,16 +3,15 @@
 'use strict';
 
 (function() {
- 
     Ox.load({
         UI: {
-            theme: 'modern' //FIXME: get theme through localStorage
+//            theme: 'modern' //FIXME: get theme through localStorage
         }
     }, loadSpeedtrans);        
 
     function loadSpeedtrans(browserSupported) {
+        alert("hi");
         if (!browserSupported) { alert("your browser is not supported"); return; }
-        
         window.pandora = Ox.App({url: '/api/'}).bindEvent({
             'load': function(data) {
 //                console.log(data);