diff options
| author | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:39:21 +0200 |
|---|---|---|
| committer | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:39:21 +0200 |
| commit | 02e0047e92de0f1575fb92c091806c4eb4b6ef26 (patch) | |
| tree | 8d5208ae9091913c7ea66a790a2e01ebf5cc06b9 /src/css.js | |
| parent | a5604aedb74ec39624b21229a5c8542c793b0382 (diff) | |
| download | jquery-02e0047e92de0f1575fb92c091806c4eb4b6ef26.tar.gz jquery-02e0047e92de0f1575fb92c091806c4eb4b6ef26.zip | |
resolve more conflicts
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 } }; } |