summaryrefslogtreecommitdiff
path: root/.settings
diff options
context:
space:
mode:
author董晓燕 <[email protected]>2021-06-03 09:55:45 +0000
committer董晓燕 <[email protected]>2021-06-03 09:55:45 +0000
commitac68e65f508799a0e555a240ae374d313a0a8d75 (patch)
tree2a339bbd8acd65e2fb235159cc9c5303ae5725b7 /.settings
parent2f39b56d617e5fba2b8d73d81cd5e6d894f85352 (diff)
parent4667c668725ff7cb673c637a297c67283876d4d4 (diff)
Merge branch 'develop' into 'master'HEADmaster
Develop See merge request dongxiaoyan/gap_tsg_api!4
Diffstat (limited to '.settings')
-rw-r--r--.settings/org.eclipse.core.resources.prefs4
1 files changed, 4 insertions, 0 deletions
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99b7664
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//01-TestCase/zjj/DLL-DeviceID-Test.robot=UTF-8
+encoding//02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot=UTF-8
+encoding/<project>=UTF-8