Merge branch 'main' into plugin-system2

ramboz · ramboz · commit 4f6aecc81c5f · 2024-07-23T15:54:38.000-07:00
diff --git a/scripts/aem.js b/scripts/aem.js
@@ -682,7 +682,6 @@ async function loadSections(element) {
 }
 
 /**
-<<<<<<< HEAD
  * Parses the plugin id and config paramters and returns a proper config
  *
  * @param {String} id A string that idenfies the plugin, or a path to it

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,6 @@ async function loadSections(element) {`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`/**`
`685`		`-<<<<<<< HEAD`
`686`	`685`	`* Parses the plugin id and config paramters and returns a proper config`
`687`	`686`	`*`
`688`	`687`	`* @param {String} id A string that idenfies the plugin, or a path to it`