diff --git a/js/huaxia.js b/js/huaxia.js
index ab2a3f4..c1cd38c 100644
--- a/js/huaxia.js
+++ b/js/huaxia.js
@@ -361,16 +361,8 @@ $(function(){
 		if ($(e.target).next().attr("class")!="upImg") {
 			console.log(123);
 			$(".uptoux").attr('src',$filePath);
-<<<<<<< HEAD
+			$(".ty_topimgtx").css("display","block")
 		}
-		$(".ty_topimgtx").css("display","block")
-=======
-		$(".ty_topimgtx").css("display","block")
-
-		}
-
-
->>>>>>> ea0028c366c205a72ec0c2ce140272053e047979
 	})
 	// 立即投稿
 	$('#submitTG').click(function(){