Unverified Commit 92f65eed authored by Matt Clarke's avatar Matt Clarke Committed by GitHub

Merge conflicts

parent b52be27f
......@@ -8,11 +8,7 @@ class DefaultContainerBuildNodeImages {
'shell': '/usr/bin/scl enable devtoolset-6 -- /bin/bash -e -x'
],
'centos7-gcc8': [
<<<<<<< HEAD
'image': 'screamingudder/centos7-build-node:5.0.7',
=======
'image': 'screamingudder/centos7-build-node:5.1.0',
>>>>>>> test
'shell': '/usr/bin/scl enable devtoolset-8 -- /bin/bash -e -x'
],
'debian9': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment