Merge pull request #91 from adiwg/sync-master-develop-fix-merge-confl…

…icts Fix-merge-conflicts-master-develop
adiwg · Jun 17, 2024 · 4eefa7d · 4eefa7d
2 parents 65830b0 + 6bb2761
commit 4eefa7d
Show file tree

Hide file tree

Showing 60 changed files with 1 addition and 20,622 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,5 @@ dev
 mkmf.log
 node_modules
 resources/js
+resources/json
 .vscode
diff --git a/resources/json/adiwg_addressType.json b/resources/json/adiwg_addressType.json
diff --git a/resources/json/adiwg_applicationProfile.json b/resources/json/adiwg_applicationProfile.json
diff --git a/resources/json/adiwg_dataQualityElement.json b/resources/json/adiwg_dataQualityElement.json
diff --git a/resources/json/adiwg_dataType.json b/resources/json/adiwg_dataType.json