更新至V1.67，更新内容在笔记中查看

admin/appmarket/template/cloudappmarket.htm

@@ -9,7 +9,7 @@
 	border-bottom: 1px solid #f2f2f2;
 	position: relative;
 	display: flex;
-    align-items: center;
+  align-items: center;
 }
 .app_upgradelist .progess {
 	position: absolute;

admin/system/template/xtxx.htm

@@ -25,7 +25,7 @@
 	<div class="left-drager">
 	</div>
 	<div class="bs-main-container  clearfix">
-		<div class="main-content" style="padding:20px 0;border-top:1px solid #FFF">
+		<div class="main-content">
 			<div class="well well-sm">
 				<div class="container step_1">
 					<h2 class="title">版本信息</h2>

core/template/default/common/showmessage.htm

@@ -171,8 +171,4 @@
 	<!--{template common/footer}-->
 <!--{else}-->
 	<!--{template common/footer_ajax}-->
-<<<<<<< HEAD
 <!--{/if}-->
-=======
-<!--{/if}-->
->>>>>>> ea30bc60ea27a7f1ef0fa26c90af2abdd1ee14d9

static/css/app_manage.css

@@ -555,8 +555,7 @@ button.input-search-drop {
 }
 
 .note.u-bottom,.dateline.u-bottom {
-  margin-bottom: 0;
-  padding-bottom: 0;
+  margin:0;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: normal;