resolve conflicts

edbizarro · Sep 16, 2018 · 786bc9d · 786bc9d
1 parent db96137
commit 786bc9d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/mopidy/.config/mopidy/mopidy.conf b/mopidy/.config/mopidy/mopidy.conf
@@ -5,11 +5,7 @@ data_dir = ~/.config/mopidy/
 restore_state = true
 
 [m3u]
-<<<<<<< Updated upstream
 enabled = true
-=======
-enabled = false
->>>>>>> Stashed changes
 playlists_dir = /media/mediabarbosa/Musica/Playlists
 base_dir = /media/mediabarbosa/Musica
 default_encoding = UTF-8