diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /contrib/mac_osx/org.boxbackup.bbstored.plist.in | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
Diffstat (limited to 'contrib/mac_osx/org.boxbackup.bbstored.plist.in')
| -rw-r--r-- | contrib/mac_osx/org.boxbackup.bbstored.plist.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/mac_osx/org.boxbackup.bbstored.plist.in b/contrib/mac_osx/org.boxbackup.bbstored.plist.in index bfe8c88c..7cd746f3 100644 --- a/contrib/mac_osx/org.boxbackup.bbstored.plist.in +++ b/contrib/mac_osx/org.boxbackup.bbstored.plist.in @@ -4,6 +4,11 @@ <dict> <key>Label</key> <string>org.boxbackup.bbstored</string> +<<<<<<< HEAD +======= + <key>OnDemand</key> + <false/> +>>>>>>> 0.12 <key>RunAtLoad</key> <true/> <key>ProgramArguments</key> @@ -12,7 +17,10 @@ <string>-F</string> <string>@prefix@/etc/boxbackup/bbackupd.conf</string> </array> +<<<<<<< HEAD </array> +======= +>>>>>>> 0.12 <key>LowPriorityIO</key> <true/> <key>Nice</key> |