clean merge (#368)

openhpc · Feb 23, 2017 · 5ba3a56 · 5ba3a56
1 parent 48b6bef
commit 5ba3a56
Showing 1 changed file with 0 additions and 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
@@ -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}