Closed SebastianN8 closed 6 years ago
The conflict is in hero.
Go to my version of the code and paste in my hero code. Then save and do a pull request again. That will reset the code and remove the conflict.
The conflict is in hero.
Go to my version of the code and paste in my hero code. Then save and do a pull request again. That will reset the code and remove the conflict.