Reorganise profile settings

manifoldmarkets / manifold

Manifold Markets: A market for every question

https://manifold.markets

MIT License

413 stars 156 forks source link

Reorganise profile settings #2699

Closed SirSaltyy closed 2 months ago

vercel[bot] commented 3 months ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 8, 2024 5:05pm
docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 8, 2024 5:05pm
prod	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 8, 2024 5:05pm

SirSaltyy commented 3 months ago

Something went weird when I tried to merge main into my branch... and now it thinks I've updated every single file that got changed in main in the two weeks since I first created my branch lol... and the conflicts that I resolved locally didn't seem to update

SirSaltyy commented 3 months ago

@jahooma fixed the weird merge state. It looks like it is all working now. Feel free to just take a quick look and check everything is fine.