fix(release): fix prop-types merge conflict

redwoodjs · Dec 22, 2023 · 6c9ddbf · 6c9ddbf
1 parent f88ee70
commit 6c9ddbf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/web/src/global.web-auto-imports.ts b/packages/web/src/global.web-auto-imports.ts
@@ -6,11 +6,7 @@ import type _gql from 'graphql-tag'
 // For "internal" global types see ambient.d.ts
 
 declare global {
-<<<<<<< HEAD
   const React: typeof _React
-  const PropTypes: typeof _PropTypes
-=======
->>>>>>> 5921359bf (chore(crwa): remove React `prop-types` package (#9206))
   const gql: typeof _gql
 
   interface Window {