Merge branch 'master' into 11-stable

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/chef/cookbook/file_vendor.rb b/lib/chef/cookbook/file_vendor.rb
index 38eab185ca..406f23ca25 100644
--- a/lib/chef/cookbook/file_vendor.rb
+++ b/lib/chef/cookbook/file_vendor.rb
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,14 +27,14 @@ class Chef
       def self.on_create(&block)
         @instance_creator = block
       end
-      
+
       # Factory method that creates the appropriate kind of
       # Cookbook::FileVendor to serve the contents of the manifest
       def self.create_from_manifest(manifest)
         raise "Must call Chef::Cookbook::FileVendor.on_create before calling create_from_manifest factory" unless defined?(@instance_creator)
         @instance_creator.call(manifest)
       end
-      
+
       # Gets the on-disk location for the given cookbook file.
       #
       # Subclasses are responsible for determining exactly how the
@@ -42,7 +42,7 @@ class Chef
       def get_filename(filename)
         raise NotImplemented, "Subclasses must implement this method"
       end
-      
+
     end
   end
 end