Skip to content

Conversation

jch
Copy link
Member

@jch jch commented Oct 14, 2014

Fixes merge conflicts for #53. Letting CI run before merging in. cc @nolman

nolman and others added 3 commits October 14, 2014 09:54
Conflicts:
	spec/integration/ssl_ber_spec.rb
	spec/unit/ber/ber_spec.rb
	spec/unit/ber/core_ext/string_spec.rb
	spec/unit/ldap/dn_spec.rb
	spec/unit/ldap/entry_spec.rb
	spec/unit/ldap/filter_spec.rb
	test/test_entry.rb
jch added a commit that referenced this pull request Oct 14, 2014
@jch jch merged commit 58e643b into master Oct 14, 2014
@jch jch deleted the fix-whitespace branch October 14, 2014 18:56
astratto pushed a commit to astratto/ruby-net-ldap that referenced this pull request Dec 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants