Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

lib/gitlab/import_export/error.rb

@@ -2,4 +2,4 @@ module Gitlab
   module ImportExport
     class Error < StandardError; end
   end
-end
+end
\ No newline at end of file

lib/gitlab/import_export/import_export_reader.rb

@@ -55,7 +55,7 @@ module Gitlab
         parsed_hash = { include: value }
 
         @attributes_parser.parse(value) do |hash|
-            parsed_hash = { include: hash_or_merge(value, hash) }
+          parsed_hash = { include: hash_or_merge(value, hash) }
         end
         @json_config_hash[current_key] = parsed_hash
       end