更新 mt-book.tex

Book/mt-book.tex

 % !Mode:: "TeX:UTF-8"
 % !TEX encoding = UTF-8 Unicode
-%merge冲突测试
 %----------------------------------------------------------------------------------------
 %	PACKAGES AND OTHER DOCUMENT CONFIGURATIONS
 %----------------------------------------------------------------------------------------
@@ -116,7 +115,6 @@
 %\include{Chapter5/chapter5}
 %\include{Chapter6/chapter6}
 %\include{ChapterAppend/chapterappend}
-%\include{Chapter6/chapter46546465464654}
 
 %----------------------------------------------------------------------------------------
 %	BIBLIOGRAPHY