%merge冲突测试

06303676 · 曹润柘 · 5d7ff030 · 06303676
Commit 06303676 authored Apr 17, 2020 by 曹润柘
--- a/Book/mt-book.tex
+++ b/Book/mt-book.tex
 % !Mode:: "TeX:UTF-8"
 % !TEX encoding = UTF-8 Unicode
-
+%merge冲突测试
 %----------------------------------------------------------------------------------------
 %	PACKAGES AND OTHER DOCUMENT CONFIGURATIONS
 %----------------------------------------------------------------------------------------