WIP

vercel · Sep 28, 2024 · f8cf3a1 · f8cf3a1
2 parents 42e560e + ed03d0c
commit f8cf3a1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/docs/repo-docs/guides/tools/typescript.mdx b/docs/repo-docs/guides/tools/typescript.mdx
@@ -244,7 +244,12 @@ Exports from [Compiled Packages](/repo/docs/core-concepts/internal-packages#comp
   </Folder>
 </Files>
 
+<<<<<<< HEAD
 With these two files in place, your editor will now go to the definition you're expecting.
+=======
+With these two files in place, your editor will now navigate to the original source code.
+
+> > > > > > > ed03d0c72a74cc74e83df86bd0d0b5bfd1b2131a
 
 ### Use Node.js subpath imports instead of TypeScript compiler `paths`