diff options
| author | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:29:25 +0200 |
|---|---|---|
| committer | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:29:25 +0200 |
| commit | a5604aedb74ec39624b21229a5c8542c793b0382 (patch) | |
| tree | 9fa541ff92d96a8979af260a31f2d75492e696fd /test/unit/effects.js | |
| parent | 8547b34f9265ed2d2b5380b1db5dfcaf97d96d5a (diff) | |
| parent | 312df0441b16981dd697d74fcbc1e1f212b47b7e (diff) | |
| download | jquery-a5604aedb74ec39624b21229a5c8542c793b0382.tar.gz jquery-a5604aedb74ec39624b21229a5c8542c793b0382.zip | |
merge with master and resolve more conflicts
Diffstat (limited to 'test/unit/effects.js')
| -rw-r--r-- | test/unit/effects.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index 0979a4c1a..4faf61743 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -807,7 +807,7 @@ jQuery.checkState = function(){ jQuery.removeData(this, "olddisplay", true); start(); -} +}; // Chaining Tests test("Chain fadeOut fadeIn", function() { |