Merge branch 'dev' of github.com:erxes/erxes into manySyncerkhet

erxes · Oct 30, 2023 · f3a432b · f3a432b
2 parents b8c7ae4 + 6aa1c33
commit f3a432b
Show file tree

Hide file tree

Showing 2 changed files with 4,076 additions and 3 deletions.
diff --git a/packages/api-plugin-template.erxes/src/index.ts b/packages/api-plugin-template.erxes/src/index.ts
@@ -704,3 +704,6 @@ async function startServer() {
 }
 
 startServer();
+
+
+// conflict test
diff --git a/scripts/pluginsMap.js b/scripts/pluginsMap.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -704,3 +704,6 @@ async function startServer() {
		}

		startServer();


		// conflict test