android compatibility

mick-schroeder · Jan 2, 2011 · cc8fff6 · cc8fff6
2 parents fc26424 + b5bc403
commit cc8fff6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Resources/main_windows/blogs.js b/Resources/main_windows/blogs.js
@@ -2,7 +2,11 @@
  * This page lists all the Tuts sites. 
 */
 //Ti.UI.currentWindow.barColor = '#000000';
+<<<<<<< HEAD
 //Ti.UI.currentWindow.backgroundColor  = '#dedede';
+=======
+Ti.UI.currentWindow.backgroundColor  = '#dedede';
+>>>>>>> b5bc403b8f13cee2dac82210973091c68cb8e5ad
 
 // Rows for each of the Tuts sites. Also includes "col" property, which references that site's main color (for barcolor).
 var data = [