summaryrefslogtreecommitdiff
path: root/contrib/mac_osx/org.boxbackup.bbstored.plist.in
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/mac_osx/org.boxbackup.bbstored.plist.in')
-rw-r--r--contrib/mac_osx/org.boxbackup.bbstored.plist.in8
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>