merge conflicts

WiFuchs · WiFuchs · commit 534a296528b5 · 2021-06-03T09:01:52.000-07:00
diff --git a/src/sidebar/services/frame-sync.js b/src/sidebar/services/frame-sync.js
@@ -20,7 +20,6 @@ export function formatAnnot(ann) {
       h = (Math.imul(31, h) + s.charCodeAt(i)) | 0;
     }
     return `hsl(${Math.abs(h) % 360}, 100%, 85%)`;
-    // return `#${Math.abs(h).toString(16).padStart(6, '0').substr(0, 6)}`;
   }
   return {
     tag: ann.$tag,

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ export function formatAnnot(ann) {`
`20`	`20`	`h = (Math.imul(31, h) + s.charCodeAt(i)) \| 0;`
`21`	`21`	`}`
`22`	`22`	return `hsl(${Math.abs(h) % 360}, 100%, 85%)`;
`23`		- // return `#${Math.abs(h).toString(16).padStart(6, '0').substr(0, 6)}`;
`24`	`23`	`}`
`25`	`24`	`return {`
`26`	`25`	`tag: ann.$tag,`