From 043b9248c1f285af50fc61f2c42af3fadfd65d55 Mon Sep 17 00:00:00 2001
From: xXJSONDeruloXx <danielhimebauch@gmail.com>
Date: Tue, 4 Feb 2025 21:33:31 -0500
Subject: resolved merge conflicts in index.tsx

---
 src/index.tsx | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'src/index.tsx')

diff --git a/src/index.tsx b/src/index.tsx
index 47712dd..e55bf6b 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -281,22 +281,6 @@ function InstalledGamesSection() {
           </PanelSectionRow>
         </>
       ) : null}
-<<<<<<< HEAD
-
-      {result ? (
-        <PanelSectionRow>
-          <div style={{ 
-            padding: '12px',
-            marginTop: '16px',
-            backgroundColor: 'var(--decky-selected-ui-bg)',
-            borderRadius: '4px'
-          }}>
-            {result}
-          </div>
-        </PanelSectionRow>
-      ) : null}
-=======
->>>>>>> zip-bundle-assets
     </PanelSection>
   );
 }
@@ -315,8 +299,4 @@ export default definePlugin(() => ({
   onDismount() {
     console.log("Framegen Plugin unmounted");
   },
-<<<<<<< HEAD
-}));
-=======
 }));
->>>>>>> zip-bundle-assets
-- 
cgit v1.2.3