zoriya/Aeris
1
0
Fork 0
mirror of https://github.com/zoriya/Aeris.git synced 2026-06-03 03:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing merge

Browse Source
This commit is contained in:
Clément Le Bihan
2022-03-04 16:34:23 +01:00
parent 79fca6eba2
commit 8b7b410d77
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/services/spotify.json
+2 -12
View File
@@ -69,8 +69,7 @@
],
"reactions": [
{
<<<<<<< HEAD
"name": "PlayTrack",
"name": "Spotify_PlayTrack",
"description": {
"en": "Play a track",
"fr": "Joue une musique"
@@ -79,10 +78,6 @@
"en": "Play a track",
"fr": "Joue une musique"
},
=======
"name": "Spotify_PlayTrack",
"description": "Play a track",
>>>>>>> 26566154676c8e279c3615522129e61b851c75a9
"params": [
{
"name": "artist",
@@ -139,8 +134,7 @@
"returns": []
},
{
<<<<<<< HEAD
"name": "AddTrackToLibrary",
"name": "Spotify_AddTrackToLibrary",
"description": {
"en": "Add a track to library",
"fr": "Ajoute une musique à la librarie"
@@ -149,10 +143,6 @@
"en": "Add a song to library",
"fr": "Ajoute une musique à votre librarie"
},
=======
"name": "Spotify_AddTrackToLibrary",
"description": "Add a track to library",
>>>>>>> 26566154676c8e279c3615522129e61b851c75a9
"params": [
{
"name": "artist",