search

NightlyRevenger / TataruHelper

Tataru Helper - application for translation of in-game texts in Japan MMORPG - Final Fantasy XIV. The texts are understood as MSQ, cutscenes, quests, NPC replicas, etc.
https://github.com/NightlyRevenger/TataruHelper/releases/latest
MIT License
312 stars 46 forks source link

Merge conflict #40

Open nihilfaire opened 2 years ago

nihilfaire commented 2 years ago

У вас, похоже, кривой мердж в файле Updater/packages.config

https://github.com/NightlyRevenger/TataruHelper/blob/master/Updater/packages.config