]> git.sur5r.net Git - bacula/bacula/commit
Fix merge collision
authorKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
committerKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
commite70771bc09ad2faa5bda0a2c7f07fe4631b051fc
tree429216bf24d238a124a84e316b01853fb27fd50f
parente0e9ee32da6c4d8f4c1ce52de31b13567947fcd0
Fix merge collision

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2735 91ce42f0-d328-0410-95d8-f526ca767f89
bacula/src/dird/dird_conf.c
bacula/src/dird/dird_conf.h
bacula/src/dird/scheduler.c
bacula/src/dird/ua_cmds.c
bacula/src/dird/ua_dotcmds.c
bacula/src/dird/ua_label.c
bacula/src/dird/ua_status.c
bacula/src/dird/ua_update.c