Skip to content

Commit

Permalink
Resolving merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
KCarlile committed Jun 12, 2024
1 parent f9d78c3 commit bd7be07
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/guitar-diagrams-config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ export class GuitarDiagramsJSConfig {
// ========== BEGIN properties
// ----- References
/**
* Gets the ID attribute of the canvas HTML tag.
* @return {string} The ID attribute of the canvas HTML tag.
* Gets the ID attribute of the canvas HTML element.
* @return {string} The ID attribute of the canvas HTML element.
*/
get canvasID() {
return this.#canvasID;
} // end get canvasID property

/**
* Sets the ID attribute of the canvas HTML tag.
* @param {string} paramCanvasID - The ID attribute of the canvas HTML tag.
* Sets the ID attribute of the canvas HTML element.
* @param {string} paramCanvasID - The ID attribute of the canvas HTML element.
*/
set canvasID(paramCanvasID) {
this.#canvasID = paramCanvasID;
Expand Down Expand Up @@ -104,7 +104,7 @@ export class GuitarDiagramsJSConfig {
} // end get colorNut property

/**
* Gets the HTML color code of the nut.
* Sets the HTML color code of the nut.
* @param {string} paramColorNut - The HTML color code of the nut.
*/
set colorNut(paramColorNut) {
Expand All @@ -120,7 +120,7 @@ export class GuitarDiagramsJSConfig {
} // end get colorNutOutline property

/**
* Gets the HTML color code of the nut outline.
* Sets the HTML color code of the nut outline.
* @param {string} paramColorNutOutline - The HTML color code of the nut outline.
*/
set colorNutOutline(paramColorNutOutline) {
Expand Down

0 comments on commit bd7be07

Please sign in to comment.