From 5ba3a5677e91fb0dc98a7d153d6005c93d4a12d6 Mon Sep 17 00:00:00 2001
From: Reese Baird <reese.baird@intel.com>
Date: Wed, 22 Feb 2017 20:32:19 -0800
Subject: [PATCH] clean  merge (#368)

---
 .../recipes/install/centos7/x86_64/warewulf/slurm/steps.tex | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex
index 701f12802a..21b95f6f3e 100644
--- a/docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex
+++ b/docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex
@@ -7,15 +7,9 @@
 \input{vc.tex}
 
 % Define Base OS and other local macros
-<<<<<<< 4974dd3be4c9bc46474134bc650d1824fe86ca20
 \newcommand{\baseOS}{CentOS7.3}
 \newcommand{\OSRepo}{CentOS\_7.3}
 \newcommand{\baseos}{centos7.3}
-=======
-\newcommand{\baseOS}{CentOS7}
-\newcommand{\OSRepo}{CentOS\_7}
-\newcommand{\baseos}{centos7.2}
->>>>>>> doc update for update path (#368)
 \newcommand{\provisioner}{Warewulf}
 \newcommand{\rms}{SLURM}
 \newcommand{\arch}{x86\_64}