Merge merged s-c into sc

2011-11-11 11:19:22 -08:00 · 2011-11-11 11:19:22 -08:00 · 530a95e16a
--- a/services/sync/tests/tps/all_tests.json
+++ b/services/sync/tests/tps/all_tests.json
@ -21,8 +21,7 @@
    "test_privbrw_tabs.js",
    "test_bookmarks_in_same_named_folder.js",
    "test_client_wipe.js",
-    "test_special_tabs.js",
-    "test_mozmill_sanity.js"
+    "test_special_tabs.js"
  ]
 }