diff options
Diffstat (limited to 'src/css.js')
| -rw-r--r-- | src/css.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/css.js b/src/css.js index 964b18fcd..b2d3af655 100644 --- a/src/css.js +++ b/src/css.js @@ -252,11 +252,7 @@ if ( !jQuery.support.opacity ) { style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : -<<<<<<< HEAD - style.filter + " " + opacity; -======= filter + " " + opacity; ->>>>>>> 312df0441b16981dd697d74fcbc1e1f212b47b7e } }; } |