解决代码冲突

public/UEditor/themes/default/dialogbase.css

@@ -1,104 +1,3 @@
-<<<<<<< HEAD
-/*弹出对话框页面样式组件
-*/
-
-/*reset
-*/
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    outline: 0;
-    font-size: 100%;
-}
-
-body {
-    line-height: 1;
-}
-
-ol, ul {
-    list-style: none;
-}
-
-blockquote, q {
-    quotes: none;
-}
-
-ins {
-    text-decoration: none;
-}
-
-del {
-    text-decoration: line-through;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-/*module
-*/
-body {
-    background-color: #fff;
-    font: 12px/1.5 sans-serif, "宋体", "Arial Narrow", HELVETICA;
-    color: #646464;
-}
-
-/*tab*/
-.tabhead {
-    position: relative;
-    z-index: 10;
-}
-
-.tabhead span {
-    display: inline-block;
-    padding: 0 5px;
-    height: 30px;
-    border: 1px solid #ccc;
-    background: url("images/dialog-title-bg.png") repeat-x;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-    *margin-right: 5px;
-}
-
-.tabhead span.focus {
-    height: 31px;
-    border-bottom: none;
-    background: #fff;
-}
-
-.tabbody {
-    position: relative;
-    top: -1px;
-    margin: 0 auto;
-    border: 1px solid #ccc;
-}
-
-/*button*/
-a.button {
-    display: block;
-    text-align: center;
-    line-height: 24px;
-    text-decoration: none;
-    height: 24px;
-    width: 95px;
-    border: 0;
-    color: #838383;
-    background: url(../../themes/default/images/icons-all.gif) no-repeat;
-}
-
-a.button:hover {
-    background-position: 0 -30px;
-=======
 /*弹出对话框页面样式组件
 */
 
@@ -198,5 +97,4 @@ a.button {
 
 a.button:hover {
     background-position: 0 -30px;
->>>>>>> master
 }