resolve conflicts

This commit is contained in:
nyanmisaka
2020-07-31 00:30:05 +08:00
340 changed files with 8623 additions and 10472 deletions
-1
View File
@@ -438,7 +438,6 @@
"HeaderPassword": "Password",
"HeaderPasswordReset": "Password Reset",
"HeaderPaths": "Paths",
"HeaderPendingInvitations": "Pending Invitations",
"HeaderPeople": "People",
"HeaderPhotoAlbums": "Photo Albums",
"HeaderPinCodeReset": "Reset Pin Code",