合并问题

e/a.html

@@ -131,14 +131,9 @@
						console.log(stt)
						if($data.articleContent) {
							document.getElementById("articleContent").innerHTML = $data.articleContent;
<<<<<<< HEAD
							descContent=document.getElementById("articleContent").innerText;
=======
							
							descContent=document.getElementById("articleContent").innerText;
							console.log($data.articleContent)
							console.log(descContent)
>>>>>>> refs/remotes/origin/test
							console.log(descContent)
						}
						if($data.subject) {
							document.getElementsByClassName("tagList")[0].style.display = "block";