Resolve merge conflict

umati · Jan 29, 2024 · 8079d68 · 8079d68
2 parents 9f6d1b5 + 9dc9fc2
commit 8079d68
Show file tree

Hide file tree

Showing 73 changed files with 13,470 additions and 4 deletions.
diff --git a/IJT_Documents/OPC_UA_IJT_Group_Presentation.pdf b/IJT_Documents/OPC_UA_IJT_Group_Presentation.pdf
diff --git a/IJT_Documents/README.md b/IJT_Documents/README.md
@@ -1,3 +1,6 @@
 This directory contains the following documents:
 
-OPC_UA_IJT_Group_Presentation
+1. OPC_UA_IJT_Group_Presentation.pdf.
+
+     This presentation provides an overview of OPC UA and IJT Companion Specifications.   
+    **Note:** Use PDF Bookmarks for easier navigation to required sections.
diff --git a/OPC_UA_Clients/.gitignore b/OPC_UA_Clients/.gitignore
@@ -1,2 +1,15 @@
-package-lock.json
 node_modules
+node_modules/
+.vscode
+MockCache/
+.venv/
+venv/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+
+Temp/
+
+OLD/