Browse Source

Merge branch 'master' of http://git.jieweizhineng.com/adslunk/python_opc_api

Conflicts:
	config/config.json
root 2 years atrás
parent
commit
17f1569e22
1 changed files with 6 additions and 0 deletions
  1. 6 0
      .idea/vcs.xml

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>