resolved merge conflict

Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
+    rake (0.9.2.2)
+    rcov (1.0.0)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)

VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 1
-:build: 
 :major: 1
 :minor: 0
+:build: 
+:patch: 3

lib/mt940.rb

@@ -220,7 +220,8 @@ def parse_content(content)
           else
             @not_implemented_fields ||= []
             @not_implemented_fields << [code, content]
-            $stderr << "code not implemented: code:#{code} content:\"#{content}\"\n" if $DEBUG
+            $stderr << "code not implemented: code:#{code} content: \"#{content}\"\n" if $DEBUG
+
           end
         end
       end

mt940_parser.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mt940_parser}
-  s.version = "1.0.1"
+  s.name = "mt940_parser"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thies C. Arntzen", "Phillip Oertel"]
-  s.date = %q{2011-02-28}
-  s.email = %q{[email protected]}
+  s.date = "2012-04-20"
+  s.email = "[email protected]"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
     "test/fixtures/currency_in_25.yml",
     "test/fixtures/empty_86.txt",
     "test/fixtures/empty_86.yml",
+    "test/fixtures/empty_entry_date.txt",
+    "test/fixtures/empty_entry_date.yml",
     "test/fixtures/empty_line.txt",
     "test/fixtures/empty_line.yml",
     "test/fixtures/missing_crlf_at_end.txt",
@@ -47,23 +49,24 @@ Gem::Specification.new do |s|
     "test/fixtures/sepa_mt9401.yml",
     "test/fixtures/sepa_snippet.txt",
     "test/fixtures/sepa_snippet_broken.txt",
+    "test/fixtures/with_binary_character.txt",
+    "test/fixtures/with_binary_character.yml",
     "test/helper.rb",
     "test/test_customer_statement_message.rb",
     "test/test_mt940.rb"
   ]
-  s.homepage = %q{http://github.com/betterplace/mt940_parser}
+  s.homepage = "http://github.com/betterplace/mt940_parser"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{MT940 parses account statements in the SWIFT MT940 format.}
+  s.rubygems_version = "1.8.15"
+  s.summary = "MT940 parses account statements in the SWIFT MT940 format."
   s.test_files = [
     "test/helper.rb",
     "test/test_customer_statement_message.rb",
     "test/test_mt940.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then