resolve more conflicts

2011-04-12 11:39:21 +02:00 · 2011-04-12 11:39:21 +02:00 · 02e0047e92
parent a5604aedb7
commit 02e0047e92
1 changed files with 0 additions and 4 deletions
--- 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
 		}
 	};
 }