Merging an ugly set of changes I had forgotten about.

2011-03-17 21:37:17 -04:00 · 2011-03-17 21:37:17 -04:00 · 84e42ceb78
commit 84e42ceb78
parent dcbb2017c8 f46c68dce3
23 changed files with 228 additions and 272 deletions
--- a/Manifest.txt
+++ b/Manifest.txt
@ -21,7 +21,10 @@ lib/net/ldap/entry.rb
 lib/net/ldap/filter.rb
 lib/net/ldap/password.rb
 lib/net/ldap/pdu.rb
+<<<<<<< HEAD
 lib/net/ldif.rb
+=======
+>>>>>>> f46c68dce3be545811041fb344273a9c84d372c4
 lib/net/snmp.rb
 spec/integration/ssl_ber_spec.rb
 spec/spec.opts