confilict

a16934a3 · Li Yongyu · 84ac91ce · a16934a3 · a16934a3 · a16934a3
Commit a16934a3 authored Mar 10, 2021 by Li Yongyu
5 changed files
--- a/nwn_Api_auto_test/src/com/offcn/TestUnti/.gitignore
+++ b/nwn_Api_auto_test/src/com/offcn/TestUnti/.gitignore
+/Mail.java
+/RequestDataUtils.java
--- a/nwn_Api_auto_test/src/com/offcn/api/nwn/service/.gitignore
+++ b/nwn_Api_auto_test/src/com/offcn/api/nwn/service/.gitignore
+/delStuFromPackage.java
+/findEdupack.java
+/getTemplateInfo.java
--- a/nwn_Api_auto_test/src/com/offcn/process/.gitignore
+++ b/nwn_Api_auto_test/src/com/offcn/process/.gitignore
+/NWN.java
--- a/nwn_Api_auto_test/src/com/offcn/test/.gitignore
+++ b/nwn_Api_auto_test/src/com/offcn/test/.gitignore
+/APITest_nwn.java
--- a/nwn_Api_auto_test/src/resources/.gitignore
+++ b/nwn_Api_auto_test/src/resources/.gitignore
+/map.txt