fix: conflict

This commit is contained in:
kunkka 2020-10-22 21:36:20 +08:00
commit fa1b397571
17 changed files with 94 additions and 28 deletions

View file

@ -32,6 +32,9 @@ export default {
showLess: "SHOW LESS",
EPsSingles: "EPs & Singles",
albums: "Albums",
withAlbums: "Albums",
artist: "Artist",
videos: "Music Videos",
},
album: {
released: "Released",
@ -89,5 +92,9 @@ export default {
mv: "MVs",
playlist: "Playlists",
noResult: "No Results",
searchFor: "Search for",
},
common: {
songs: "Songs",
},
};