resolve more conflicts

02e0047e · louisremi · a5604aed · 02e0047e
Commit 02e0047e authored Apr 12, 2011 by louisremi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

css.js src/css.js +0 -4

No files found.
--- 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
 		}
 	};
 }