Merge branch 'main' into plugin-system2

adobe · Jul 23, 2024 · 4f6aecc · 4f6aecc
2 parents 8b0eae8 + 85a639a
commit 4f6aecc
Showing 1 changed file with 0 additions and 1 deletion.
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