fixup merge conflict

Author: George Adams

ansible/inventory.yml

@@ -146,10 +146,6 @@ hosts:
         macos10.12-x64-1: {ip: 207.254.58.162, port: 10001, user: administrator}
         macos10.12-x64-2: {ip: 207.254.58.162, port: 10002, user: administrator}
 
-<<<<<<< HEAD
-=======
-
->>>>>>> Initial macOS ansible scripts
     - osuosl:
         aix61-ppc64_be-1: {ip: 140.211.9.101}
         aix61-ppc64_be-2: {ip: 140.211.9.100}

ansible/roles/baselayout/vars/main.yml

@@ -50,11 +50,7 @@ packages: {
   ],
 
   debian8: [
-<<<<<<< HEAD
-    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26',
-=======
-    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,sudo',
->>>>>>> add ccache for macos
+    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
   ],
 
   debian9: [

ansible/roles/jenkins-worker/templates/start.j2

@@ -1,7 +1,6 @@
 #!/bin/bash
 export HOME={{ home }}/{{ server_user }}
 export NODE_TEST_DIR="$HOME/tmp"
-<<<<<<< HEAD
 export JOBS="{{ jobs_env }}"
 export OSTYPE=zos
 
@@ -20,13 +19,3 @@ export LDFLAGS="-q64"
     -jar {{ home }}/{{ server_user }}/slave.jar -secret {{ secret }} \
     -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/slave-agent.jnlp >{{ home }}/{{ server_user }}/jenkins.log 2>&1  &
 EOF
-=======
-export JOBS=2
-export NODE_COMMON_PIPE=/Users/iojs/test.pipe
-export OSTYPE=osx
-export ARCH=x64
-export DESTCPU=x64
-
-java -jar {{ home }}/{{ server_user }}/slave.jar -secret {{ secret }} \
-    -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/slave-agent.jnlp
->>>>>>> Initial macOS ansible scripts