merge kitchen.yml

Author: Sebastian Gumprich

.kitchen.yml

@@ -11,11 +11,6 @@ provisioner:
   require_ruby_for_busser: false
   ansible_verbose: true
   ansible_diff: true
-<<<<<<< 7d5e6960c817dfd191f1cb095bc237064424e8c4
-  roles_path: ../ansible-ssh-hardening/
-  playbook: default.yml
-
-=======
   hosts: all
   roles_path: ../ansible-ssh-hardening/
   playbook: default.yml
@@ -26,7 +21,6 @@ verifier:
   inspec_tests:
     - https://github.com/dev-sec/tests-ssh-hardening
 
->>>>>>> debian 8 support, verifier changes, metadata change
 platforms:
 - name: ubuntu-12.04
   driver_config:
@@ -62,14 +56,7 @@ platforms:
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
 
 suites:
-<<<<<<< 7d5e6960c817dfd191f1cb095bc237064424e8c4
-- name: ansible_1.9
-  provisioner:
-    ansible_version: 1.9.4
-- name: ansible_latest
-=======
 - name: ssh-ansible_1.9
   provisioner:
     ansible_version: 1.9.4
 - name: ssh-ansible_latest
->>>>>>> debian 8 support, verifier changes, metadata change