github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve more conflicts

Browse Source
This commit is contained in:
louisremi
2011-04-12 11:39:21 +02:00
parent a5604aedb7
commit 02e0047e92
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/css.js
View File

@@ -252,11 +252,7 @@ if ( !jQuery.support.opacity ) {
style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
<<<<<<< HEAD
style.filter + " " + opacity;
=======
filter + " " + opacity;
>>>>>>> 312df0441b16981dd697d74fcbc1e1f212b47b7e
}
};
}