From 9a386718714d70f7100b5de297dfd0869d98e47b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 23 Dec 2015 16:06:41 +0100
Subject: [PATCH] k 3 buildbot: fix merge fuckup
---
krebs/3modules/buildbot/master.nix | 5 -----
1 file changed, 5 deletions(-)
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 19aecead1..483ba18e7 100644
--- 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",