search

Cyrexxis / RokTracker

Open Source Rise of Kingdoms Stats Management Tool. Track TOP X Players of kingdom / alliance / honor leaderboard.
MIT License
47 stars 18 forks source link

[BUG]how can i solve it??? #86

Closed quannv98k3 closed 5 months ago

quannv98k3 commented 8 months ago

Screenshot 2024-03-18 081508 I hapenned when i try to pull your file to my computer

Cyrexxis commented 8 months ago

That means you have modified a file that also was modified by me. If you didn't change any code, it is probably the config file. If you are ok with loosing your modifications, use git reset --hard or something similar in the client you use.