search

craigallendev / prevent-awareness

Prevent awareness website
0 stars 1 forks source link

Fix merge conflicts properly #30

Closed CrazyEggz closed 3 months ago

CrazyEggz commented 3 months ago

Sorry, I didn't fix the merge conflicts properly in my branch. This should fix them.

I also ran a "Format Document".