diff options
Diffstat (limited to 'src/effects.js')
| -rw-r--r-- | src/effects.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/effects.js b/src/effects.js index a80d2dbd6..a6b5748f5 100644 --- a/src/effects.js +++ b/src/effects.js @@ -382,8 +382,6 @@ function Animation( elem, properties, options ) { } jQuery.Animation = jQuery.extend( Animation, { -<<<<<<< HEAD -======= tweeners: { "*": [ function( prop, value ) { @@ -393,7 +391,6 @@ jQuery.Animation = jQuery.extend( Animation, { } ] }, ->>>>>>> b3b2d6c... Effects: Adding unit tests for jQuery.Animation tweener: function( props, callback ) { if ( jQuery.isFunction( props ) ) { callback = props; |