deac/jquery
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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) ? style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) : filter.replace(ralpha, opacity) :
<<<<<<< HEAD
style.filter + " " + opacity;
=======
filter + " " + opacity; filter + " " + opacity;
>>>>>>> 312df0441b16981dd697d74fcbc1e1f212b47b7e
} }
}; };
} }