incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [6/37] spec commit: another rebase fix
Date Wed, 18 Apr 2012 21:49:52 GMT
another rebase fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/30cba336
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/30cba336
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/30cba336

Branch: refs/heads/master
Commit: 30cba3360664633a6d520a2020a2a050aab9bde3
Parents: f0a6df2
Author: Fil Maj <maj.fil@gmail.com>
Authored: Mon Apr 16 16:28:24 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:28:24 2012 -0700

----------------------------------------------------------------------
 autotest/test-runner.js |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/30cba336/autotest/test-runner.js
----------------------------------------------------------------------
diff --git a/autotest/test-runner.js b/autotest/test-runner.js
index f16c1cd..0b74f27 100644
--- a/autotest/test-runner.js
+++ b/autotest/test-runner.js
@@ -1,28 +1,7 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-// Prevent QUnit from running when the DOM load event fires
 QUnit.config.autostart = false;
 if (window.sessionStorage != null) {
     window.sessionStorage.clear();
 }
-=======
-sessionStorage.clear();
->>>>>>> updated test-runner and changed title of battery tests
-=======
-=======
->>>>>>> updated test-runner and changed title of battery tests
-sessionStorage.clear();
-=======
-// Prevent QUnit from running when the DOM load event fires
-QUnit.config.autostart = false;
-=======
->>>>>>> updated test-runner and changed title of battery tests
-if (window.sessionStorage != null) {
-    window.sessionStorage.clear();
-}
->>>>>>> on wp7 sessionStorage does not exist until just before device
ready
->>>>>>> on wp7 sessionStorage does not exist until just before device
ready
 
 // Timeout is 2 seconds to allow physical devices enough
 // time to query the response. This is important for some


Mime
View raw message