X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=328498c6c328755a6305b63083335785282e2a0f;hb=78717f3f0a57f3174a176ac9319a1b2eb485e9c3;hp=230c626a00d3999863c4f7bb1e55c7fd98debc47;hpb=9fa8e9f89fea8a8103ff8dc0cfbc48f25a22a40f;p=bacula%2Fbacula

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 230c626a00..328498c6c3 100644
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -1770,10 +1770,6 @@ static int storage_cmd(JCR *jcr)
    /* Try to connect for 1 hour at 10 second intervals */
 
    sd->set_source_address(me->FDsrc_addr);
-<<<<<<< HEAD
-=======
-
->>>>>>> caaa5db... Implement RestoreObject for sqlite + cleanups
    if (!sd->connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval,
                 _("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1)) {
      sd->destroy();