k 3 buildbot: fix merge fuckup

2015-12-23 16:06:41 +01:00 · 2015-12-23 16:06:41 +01:00 · 9a38671871
parent 0082c89ead
commit 9a38671871
1 changed files with 0 additions and 5 deletions
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@ -95,13 +95,8 @@ let
      s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file),
                              slavedest=file))

-<<<<<<< HEAD
    addShell(s,name="infest-cac-centos7",env={"LOGNAME": "shared"},
             command=nixshell + ["infest-cac-centos7"])
-=======
-    addShell(s,name="complete-build-centos7",env={"LOGNAME": "shared"},
-             command=nix-shell + ["krebs-ci"])
->>>>>>> f59080e76f950a5a8e33d1edd4314ffaa14187fc

    c['builders'].append(
        util.BuilderConfig(name="full-tests",