From 97b2a3bfa2539f3f4b8b5f4b97e62c570ec51ddf Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Wed, 26 Nov 2014 23:05:40 +0000
Subject: [PATCH] fixed conflict file

---
 roles/openLdapClient/defaults/main.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/roles/openLdapClient/defaults/main.yml b/roles/openLdapClient/defaults/main.yml
index ce44462..0f134e2 100644
--- a/roles/openLdapClient/defaults/main.yml
+++ b/roles/openLdapClient/defaults/main.yml
@@ -1,9 +1,6 @@
 ---
 ldapDomain: "monash.edu.au" 
-<<<<<<< HEAD
-=======
 ldapUri: "ldaps://ldapserver.com/"
->>>>>>> e4c36d0b99d57b2af234bdb1bb3ae982dde0663c
 ldapDn: "cn=ldapbind,cn=users,dc=monash,dc=edu,dc=au" 
 ldapPassword: "secret"
 ldapBase: "cn=users,dc=monash,dc=edu,dc=au"
@@ -13,14 +10,8 @@ ldapUserPricipal: "userPrincipalName"
 ldapGroupBase: "ou=groups,dc=monash,dc=edu,dc=au"
 tlsCaCertDirectory: "/etc/openldap/certs"
 tlsCaCertFile: "/etc/openldap/certs/ca.pem"
-<<<<<<< HEAD
-ldapCaCertFileSource: "/etc/openldap"
-cacertFile: "ca.pem"
-=======
 ldapCaCertFileSource: "/etc/openldap/certs"
 cacertFile: "ca.pem"
 ldapRfc2307: ""
 ldapRfc2307Pam: ""
 
->>>>>>> e4c36d0b99d57b2af234bdb1bb3ae982dde0663c
-
-- 
GitLab