fix: merge conflict

solana-foundation · Nov 30, 2023 · 2c661d5 · 2c661d5
1 parent 0449cae
commit 2c661d5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/pages/api/paths/[[...group]].ts b/src/pages/api/paths/[[...group]].ts
@@ -11,10 +11,7 @@ import {
   allDeveloperResources,
   allSolanaDocs,
   allDeveloperWorkshops,
-<<<<<<<< HEAD:src/pages/api/paths/[[...group]].ts
   allSolanaRPCDocs,
-========
->>>>>>>> main:src/pages/api/paths/[group].ts
 } from "contentlayer/generated";
 
 export default function handler(