gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
zhanghongqing
2018-02-23 12:21:47 +08:00
parent 24edd11520
commit 8b99170326
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.core.resources.prefs
View File

@@ -7,8 +7,5 @@ encoding//src/main/resources/matt.properties=UTF-8
encoding//src/main/resources/nis.properties=UTF-8
encoding//src/main/resources/table.properties=UTF-8
encoding//src/main/webapp/WEB-INF/include/header.jsp=UTF-8
encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8
encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8
encoding//src/main/webapp/static/common/jeesite.css=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8