github
diff --git a/‎ldap.sh
Lines changed: 0 additions & 9 deletions b/‎ldap.sh
Lines changed: 0 additions & 9 deletions
diff --git a/‎lib/github/ldap.rb
Lines changed: 0 additions & 1 deletion b/‎lib/github/ldap.rb
Lines changed: 0 additions & 1 deletion
@@ -300,7 +300,6 @@ def configure_membership_validation_strategy(strategy = nil)
         end
     end
 
-<<<<<<< 96ba488c1e07d7a1f95f1287414805c3b0493b4c
     # Internal:  Set the user search strategy that will be used by
     #            Domain#user?.
     #
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ def configure_membership_validation_strategy(strategy = nil)`
`300`	`300`	`end`
`301`	`301`	`end`
`302`	`302`
`303`		`-<<<<<<< 96ba488c1e07d7a1f95f1287414805c3b0493b4c`
`304`	`303`	`# Internal: Set the user search strategy that will be used by`
`305`	`304`	`# Domain#user?.`
`306`	`305`	`#`