CONFLICT: Merge conflicts

This commit is contained in:
EvanLin3141
2025-02-21 22:52:39 +00:00
parent 60060617a5
commit 1f3a660883

View File

@@ -207,7 +207,6 @@ const UserPage: React.FC = () => {
{/* User Type (e.g., "USER") */} {/* User Type (e.g., "USER") */}
<small className="text-green-400">{userPageVariant.toUpperCase()}</small> <small className="text-green-400">{userPageVariant.toUpperCase()}</small>
Bio Section
<div className="mt-6 text-center"> <div className="mt-6 text-center">
<h2 className="text-xl font-semibold mb-3">About {profileData.username}</h2> <h2 className="text-xl font-semibold mb-3">About {profileData.username}</h2>
<p className="text-gray-300 whitespace-pre-wrap">{profileData.bio}</p> <p className="text-gray-300 whitespace-pre-wrap">{profileData.bio}</p>