Update Conflict

jakewaldron · Feb 26, 2016 · 73b59e1 · 73b59e1
2 parents c8532c4 + d8dc65f
commit 73b59e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -266,4 +266,4 @@ TV Seasons:
 ![alt tag](http://i.imgur.com/fF7HNL4.jpg)
 
 TV Episodes:
-![alt tag](http://i.imgur.com/xiwUNPT.jpg)
+![alt tag](http://i.imgur.com/xiwUNPT.jpg)
diff --git a/scripts/config.conf b/scripts/config.conf
@@ -464,4 +464,4 @@ song_sort_1_reverse = False
 song_sort_2 = ''
 song_sort_2_reverse = False
 song_sort_3 = ''
-song_sort_3_reverse = False
+song_sort_3_reverse = False