Merge pull request #399 from Shared-Reality-Lab/jaydeepsingh25-patch-1

Update info.ts
Shared-Reality-Lab · Dec 16, 2024 · 37ef7a2 · 37ef7a2
2 parents 7c9190f + 6b3b272
commit 37ef7a2
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/info/info.ts b/src/info/info.ts
@@ -70,11 +70,8 @@ port.onMessage.addListener(async (message) => {
     let label = browser.i18n.getMessage("renderingLabel");
 
     let count = 1;
-<<<<<<< HEAD
     if (renderings) {
-=======
     if(renderings){
->>>>>>> b0ae8da4c5d10b979bf8f430dee9c84a3c24efff
         for (let rendering of renderings["renderings"]) {
             let container = document.createElement("section");
             container.classList.add("container");
@@ -91,11 +88,8 @@ port.onMessage.addListener(async (message) => {
             labelButton.textContent = label + " " + count + ": " + rendering["description"];
             headerElement.append(labelButton);
             container.append(headerElement);
-<<<<<<< HEAD
 
-=======
 
->>>>>>> b0ae8da4c5d10b979bf8f430dee9c84a3c24efff
             if (rendering["type_id"] === RENDERERS.text) {
                 let contentDiv = utils.addRenderingContent(container, contentId);
                 const text = rendering["data"]["text"] as string;
@@ -292,4 +286,4 @@ port.onMessage.addListener(async (message) => {
 port.postMessage({
     "type": "info",
     "request_uuid": request_uuid
-});
+});