Skip to content
Permalink
Browse files

resolve more conflicts

  • Loading branch information...
louisremi
louisremi committed Apr 12, 2011
1 parent a5604ae commit 02e0047e92de0f1575fb92c091806c4eb4b6ef26
Showing with 0 additions and 4 deletions.
  1. +0 −4 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
}
};
}

0 comments on commit 02e0047

Please sign in to comment.
You can’t perform that action at this time.