Resolve conflicts

voxpupuli · Oct 13, 2016 · 8da6454 · 8da6454
1 parent eaa296b
commit 8da6454
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/manifests/apache/vhost.pp b/manifests/apache/vhost.pp
@@ -127,7 +127,7 @@
       content => template('puppetboard/apache/ldap.erb'),
       require => File["${docroot}/wsgi.py"],
       notify  => Service[$::puppetboard::params::apache_service],
-    } 
+    }
   }
   else {
     $ldap_additional_includes = undef

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