From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 22 Sep 2016 08:35:01 +0000 (+0200)
Subject: small update
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=07dc43a8049adad53113b2244f8c94dbeb487b74;p=dotfiles.git

small update
---

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 0bb3a69..155fa6d 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,8 +15,8 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-
-collections = ["from b"]
+conflict_resolution = a wins
+collections = ["default"]
 
 [storage contacts_local]
 type = filesystem
@@ -34,6 +34,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
+conflict_resolution = a wins
 collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
diff --git a/music/.config/mpd/mpd.conf b/music/.config/mpd/mpd.conf
index 5532ffb..d6e5dd2 100644
--- a/music/.config/mpd/mpd.conf
+++ b/music/.config/mpd/mpd.conf
@@ -1,7 +1,6 @@
 db_file            "~/.config/mpd/database"
 log_file           "~/.config/mpd/log"
 
-# Optional
 music_directory    "/mnt/data/music"
 playlist_directory "~/.config/mpd/playlists"
 pid_file           "~/.config/mpd/pid"
@@ -18,16 +17,11 @@ follow_inside_symlinks		"yes"
 
 input {
         plugin "curl"
-#       proxy "proxy.isp.com:8080"
-#       proxy_user "user"
-#       proxy_password "password"
 }
 
 audio_output {
 	type		"pulse"
 	name		"My Pulse Output"
-#	server		"remote_server"		# optional
-#	sink		"remote_server_sink"	# optional
 }
 
 audio_output {