se resuelven conflictos de stage que se generaron a hacer el merge co…

…n develop
angel1285528 · May 20, 2024 · 86f1dca · 86f1dca
1 parent 46ff1f5
commit 86f1dca
Show file tree

Hide file tree

Showing 3 changed files with 219 additions and 1,679 deletions.
diff --git a/app/(web)/page.tsx b/app/(web)/page.tsx
@@ -56,3 +56,4 @@ export default function Home(): React.JSX.Element {
     </main>
   )
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,3 +56,4 @@ export default function Home(): React.JSX.Element {
		</main>
		)
		}