diff --git a/src/TestPanel.js b/src/TestPanel.js index be27577..55bd7fd 100644 --- a/src/TestPanel.js +++ b/src/TestPanel.js @@ -416,13 +416,9 @@ useEffect(()=>{ {(p.poisonResist*100).toFixed(1)}%
-<<<<<<< HEAD -
Damage Resist.
{(p.damageResist*100).toFixed(1)}%
- -=======
Damage Resist.
{(p.damageResist*100).toFixed(1)}%
->>>>>>> 81dd37a4b357885199c35d836d6de68da815f44c +