Resolve conflicts

voxpupuli · Oct 12, 2016 · 5afc7b3 · 5afc7b3
1 parent d930137
commit 5afc7b3
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -117,8 +117,6 @@ class { 'puppetboard':
       it { should contain "PUPPETDB_CERT = '/var/lib/puppet/ssl/certs/test.networkninjas.net.pem'" }
     end
   end
-<<<<<<< HEAD
-=======
 
   context 'default parameters' do
     hosts.each do |host|
@@ -156,14 +154,13 @@ class { 'puppetboard':
     end
 
     describe file('/etc/httpd/conf.d/puppetboard-ldap.conf') do
-      it { should contain 'AuthBasicProvider ldap' }
-      it { should contain 'AuthLDAPBindDN "cn=user,dc=puppet,dc=example,dc=com"' }
-      it { should contain 'AuthLDAPURL "ldap://puppet.example.com"' }
+     it { should contain "AuthBasicProvider ldap" }
+     it { should contain 'AuthLDAPBindDN "cn=user,dc=puppet,dc=example,dc=com"' }
+     it { should contain 'AuthLDAPURL "ldap://puppet.example.com"' }
     end
     describe file('/srv/puppetboard/puppetboard/settings.py') do
       it { should contain "PUPPETDB_KEY = '/var/lib/puppet/ssl/private_keys/test.networkninjas.net.pem'" }
       it { should contain "PUPPETDB_CERT = '/var/lib/puppet/ssl/certs/test.networkninjas.net.pem'" }
     end
   end
->>>>>>> 7e1f014... Changes
 end