解决代码冲突

public/UEditor/third-party/webuploader/webuploader.css

@@ -1,33 +1,3 @@
-<<<<<<< HEAD
-.webuploader-container {
-	position: relative;
-}
-.webuploader-element-invisible {
-	position: absolute !important;
-	clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
-    clip: rect(1px,1px,1px,1px);
-}
-.webuploader-pick {
-	position: relative;
-	display: inline-block;
-	cursor: pointer;
-	background: #00b7ee;
-	padding: 10px 15px;
-	color: #fff;
-	text-align: center;
-	border-radius: 3px;
-	overflow: hidden;
-}
-.webuploader-pick-hover {
-	background: #00a2d4;
-}
-
-.webuploader-pick-disable {
-	opacity: 0.6;
-	pointer-events:none;
-}
-
-=======
 .webuploader-container {
 	position: relative;
 }
@@ -56,4 +26,3 @@
 	pointer-events:none;
 }
 
->>>>>>> master