Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

Commit

Permalink
Merge Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Soneliem committed Jun 28, 2022
2 parents 3cdca19 + 15097e6 commit f1f5ba3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Localization.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ POEditor lets people collaboratively edit translations, supports auto-translatio
- Ozymo

**Chinese:**
- zDragone
- zDragone
4 changes: 2 additions & 2 deletions WAIUA/VersionInfo.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<item>
<version>1.4.0.1</version>
<version>1.4.0.2</version>
<url>https://github.com/Soneliem/WAIUA/releases/latest/download/WAIUA.exe</url>
<changelog>https://github.com/Soneliem/WAIUA/releases/latest</changelog>
<mandatory>false</mandatory>
<mandatory>true</mandatory>
</item>

0 comments on commit f1f5ba3

Please sign in to comment.