diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /contrib/mac_osx/org.boxbackup.bbstored.plist.in | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'contrib/mac_osx/org.boxbackup.bbstored.plist.in')
| -rw-r--r-- | contrib/mac_osx/org.boxbackup.bbstored.plist.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/contrib/mac_osx/org.boxbackup.bbstored.plist.in b/contrib/mac_osx/org.boxbackup.bbstored.plist.in index 7cd746f3..531ab240 100644 --- a/contrib/mac_osx/org.boxbackup.bbstored.plist.in +++ b/contrib/mac_osx/org.boxbackup.bbstored.plist.in @@ -4,11 +4,8 @@ <dict> <key>Label</key> <string>org.boxbackup.bbstored</string> -<<<<<<< HEAD -======= <key>OnDemand</key> <false/> ->>>>>>> 0.12 <key>RunAtLoad</key> <true/> <key>ProgramArguments</key> @@ -17,10 +14,6 @@ <string>-F</string> <string>@prefix@/etc/boxbackup/bbackupd.conf</string> </array> -<<<<<<< HEAD - </array> -======= ->>>>>>> 0.12 <key>LowPriorityIO</key> <true/> <key>Nice</key> |