From 332885a5a4e689e6d6417912842c9e670ed55557 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Thu, 4 Feb 2016 13:18:06 +0100
Subject: [PATCH] Fix merge conflicts

---
 resources/lib/playbackutils.py | 2 +-
 resources/settings.xml         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py
index e5d6d1b8..3260950e 100644
--- a/resources/lib/playbackutils.py
+++ b/resources/lib/playbackutils.py
@@ -304,7 +304,7 @@ class PlaybackUtils():
             #     - artist : list (['U2'])
         listItem.setProperty('IsPlayable', 'true')
         listItem.setProperty('IsFolder', 'false')
-        listItem.setProperty('StartOffset', -1)
+        listItem.setProperty('StartOffset', '-1')
         listItem.setLabel(metadata['title'])
         listItem.setInfo('video', infoLabels=metadata)
         """
diff --git a/resources/settings.xml b/resources/settings.xml
index 821423ac..4e52774d 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -29,6 +29,7 @@
 		<setting id="plexLogin" label="plex.tv username" type="text" default="" visible="eq(-1,true)" />
 		<setting id="plexhome" label="Plex home in use" type="bool" default="true" visible="false" />
 		<setting id="plexToken" label="plexToken" type="text" default="" visible="false" />
+	</category>
 	<category label="30506"><!-- Sync Options -->
 		<setting id="serverSync" type="bool" label="30514" default="true" />
 		<setting id="dbSyncIndicator" label="30507" type="bool" default="false" />
@@ -46,8 +47,6 @@
         <setting id="enableUpdateSongRating" type="bool" label="30526" default="false" />
 	</category>
 
-	</category>
-	
 	<category label="30516"><!-- Playback -->
 		<setting label="30517" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=passwords)" option="close" />
 		<setting type="sep" />